diff options
author | Filipe David Borba Manana <fdmanana@gmail.com> | 2014-04-15 20:47:27 +0100 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-05-02 17:03:21 +0200 |
commit | 1e6195885baa1d3aea7b75c6fb752ce293e1b936 (patch) | |
tree | fc936a10d7df2fcd93c69abf20ec525cccb0bcfe | |
parent | 726bc372b9529a11c79dea75f2bcc8ef8a34d67a (diff) |
Btrfs-progs: allow compression property gets for read-only subvolumes
Because the function open_file_or_dir() always opened the input file in
read/write mode (O_RDWR), we were not able to due a compression property
get against a file living in a read-only subvolume/snapshot.
Fix this by opening the file with O_RDONLY mode if we're doing a property
get.
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r-- | props.c | 3 | ||||
-rw-r--r-- | utils.c | 9 | ||||
-rw-r--r-- | utils.h | 1 |
3 files changed, 10 insertions, 3 deletions
@@ -119,8 +119,9 @@ static int prop_compression(enum prop_object_type type, DIR *dirstream = NULL; char *buf = NULL; char *xattr_name = NULL; + int open_flags = value ? O_RDWR : O_RDONLY; - fd = open_file_or_dir(object, &dirstream); + fd = open_file_or_dir3(object, &dirstream, open_flags); if (fd == -1) { ret = -errno; fprintf(stderr, "ERROR: open %s failed. %s\n", @@ -1622,7 +1622,7 @@ u64 parse_size(char *s) return strtoull(s, NULL, 10) * mult; } -int open_file_or_dir(const char *fname, DIR **dirstream) +int open_file_or_dir3(const char *fname, DIR **dirstream, int open_flags) { int ret; struct stat st; @@ -1638,7 +1638,7 @@ int open_file_or_dir(const char *fname, DIR **dirstream) return -1; fd = dirfd(*dirstream); } else if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) { - fd = open(fname, O_RDWR); + fd = open(fname, open_flags); } else { /* * we set this on purpose, in case the caller output @@ -1655,6 +1655,11 @@ int open_file_or_dir(const char *fname, DIR **dirstream) return fd; } +int open_file_or_dir(const char *fname, DIR **dirstream) +{ + return open_file_or_dir3(fname, dirstream, O_RDWR); +} + void close_file_or_dir(int fd, DIR *dirstream) { if (dirstream) @@ -72,6 +72,7 @@ int btrfs_scan_block_devices(int run_ioctl); u64 parse_size(char *s); u64 arg_strtou64(const char *str); int open_file_or_dir(const char *fname, DIR **dirstream); +int open_file_or_dir3(const char *fname, DIR **dirstream, int open_flags); void close_file_or_dir(int fd, DIR *dirstream); int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args, struct btrfs_ioctl_dev_info_args **di_ret); |