mds: fix O_APPEND file mode calculation

Currently

  fd = open("aaa",O_RDWR|O_CREAT|O_APPEND,0666);

gives us fmode of 1 instead of 3.  We should only infer O_WRONLY if no
other mode is explicitly specified.

Reported-by: Fyodor Ustinov <ufm@ufm.su>
Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/include/ceph_fs.cc b/src/include/ceph_fs.cc
index 4457190b909939f8a801bc26d9d48da54c0eef77..933488b70c4e2b4ab74f9507c780520535222f01 100644 (file)
--- a/src/include/ceph_fs.cc
+++ b/src/include/ceph_fs.cc
@@ -41,7 +41,8 @@ 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)
+       if ((flags & O_APPEND) &&
+           (flags & O_ACCMODE) == 0)
                flags |= O_WRONLY;
 
        if ((flags & O_ACCMODE) == O_RDWR)