summaryrefslogtreecommitdiff
path: root/utils.c
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@gmail.com>2014-04-15 20:47:27 +0100
committerDavid Sterba <dsterba@suse.cz>2014-05-02 17:03:21 +0200
commit1e6195885baa1d3aea7b75c6fb752ce293e1b936 (patch)
treefc936a10d7df2fcd93c69abf20ec525cccb0bcfe /utils.c
parent726bc372b9529a11c79dea75f2bcc8ef8a34d67a (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>
Diffstat (limited to 'utils.c')
-rw-r--r--utils.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/utils.c b/utils.c
index 187ad3b9..44c0e4ab 100644
--- a/utils.c
+++ b/utils.c
@@ -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)