diff options
| author | Linus Torvalds | 2011-07-20 07:10:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-07-20 07:10:28 +0200 |
| commit | e6625fa48e6580a74b7e700efd7e6463e282810b (patch) | |
| tree | fdb12c5ca073bd444d9d64dee3f8e34b323aebda | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/lin... (diff) | |
| parent | ceph: fix file mode calculation (diff) | |
| download | kernel-qcow2-linux-e6625fa48e6580a74b7e700efd7e6463e282810b.tar.gz kernel-qcow2-linux-e6625fa48e6580a74b7e700efd7e6463e282810b.tar.xz kernel-qcow2-linux-e6625fa48e6580a74b7e700efd7e6463e282810b.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: fix file mode calculation
| -rw-r--r-- | net/ceph/ceph_fs.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/net/ceph/ceph_fs.c b/net/ceph/ceph_fs.c index a3a3a31d3c37..41466ccb972a 100644 --- a/net/ceph/ceph_fs.c +++ b/net/ceph/ceph_fs.c @@ -36,16 +36,19 @@ int ceph_flags_to_mode(int flags) if ((flags & O_DIRECTORY) == O_DIRECTORY) return CEPH_FILE_MODE_PIN; #endif - if ((flags & O_APPEND) == O_APPEND) - flags |= O_WRONLY; - if ((flags & O_ACCMODE) == O_RDWR) - mode = CEPH_FILE_MODE_RDWR; - else if ((flags & O_ACCMODE) == O_WRONLY) + switch (flags & O_ACCMODE) { + case O_WRONLY: mode = CEPH_FILE_MODE_WR; - else + break; + case O_RDONLY: mode = CEPH_FILE_MODE_RD; - + break; + case O_RDWR: + case O_ACCMODE: /* this is what the VFS does */ + mode = CEPH_FILE_MODE_RDWR; + break; + } #ifdef O_LAZY if (flags & O_LAZY) mode |= CEPH_FILE_MODE_LAZY; |