kclient: fix up safe/unsafe writeback flags

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index 27002f8e635e22dfbb06c822b80b79291a2b6bf9..5f313da3abd17b3a31d9a0bfc57a90598844a10d 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -911,7 +911,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino,
        }
 
        reqhead = reqm->front.iov_base;
-       if (osdc->client->mount_args.flags & CEPH_MOUNT_UNSAFE_WRITES)
+       if (osdc->client->mount_args.flags & CEPH_MOUNT_UNSAFE_WRITEBACK)
                reqhead->flags = CEPH_OSD_OP_ACK;
        else
                reqhead->flags = CEPH_OSD_OP_SAFE;

diff --git a/src/kernel/super.c b/src/kernel/super.c
index f96caab3ec755b1923e592116bf35d6d2c9fca1f..61fd95ac92edeb6cc563044d73f17c2341022404 100644 (file)
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -370,7 +370,8 @@ enum {
        Opt_mount_timeout,
        /* int args above */
        Opt_ip,
-       Opt_unsafewrites,
+       Opt_unsafewriteback,
+       Opt_safewriteback,
        Opt_dirstat,
        Opt_nodirstat,
        Opt_rbytes,
@@ -397,7 +398,8 @@ static match_table_t arg_tokens = {
        /* int args above */
        {Opt_ip, "ip=%s"},
        {Opt_debug_console, "debug_console"},
-       {Opt_unsafewrites, "unsafewrites"},
+       {Opt_unsafewriteback, "unsafewriteback"},
+       {Opt_safewriteback, "safewriteback"},
        {Opt_dirstat, "dirstat"},
        {Opt_nodirstat, "nodirstat"},
        {Opt_rbytes, "rbytes"},
@@ -570,8 +572,12 @@ static int parse_mount_args(int flags, char *options, const char *dev_name,
                case Opt_mount_timeout:
                        args->mount_timeout = intval;
                        break;
-               case Opt_unsafewrites:
-                       args->flags |= CEPH_MOUNT_UNSAFE_WRITES;
+
+               case Opt_unsafewriteback:
+                       args->flags |= CEPH_MOUNT_UNSAFE_WRITEBACK;
+                       break;
+               case Opt_safewriteback:
+                       args->flags &= ~CEPH_MOUNT_UNSAFE_WRITEBACK;
                        break;
 
                case Opt_dirstat:

diff --git a/src/kernel/super.h b/src/kernel/super.h
index c4613c0e99ced9ea4d14a7a01dd5f162938498bd..f34946b3809bd46ef76e3d88a3b1fcd9b494cefa 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -91,12 +91,12 @@ static inline unsigned long time_sub(unsigned long a, unsigned long b)
 #define CEPH_MOUNT_FSID          (1<<0)
 #define CEPH_MOUNT_NOSHARE       (1<<1) /* don't share client with other sbs */
 #define CEPH_MOUNT_MYIP          (1<<2) /* specified my ip */
-#define CEPH_MOUNT_UNSAFE_WRITES (1<<3)
+#define CEPH_MOUNT_UNSAFE_WRITEBACK (1<<3)
 #define CEPH_MOUNT_DIRSTAT       (1<<4)
 #define CEPH_MOUNT_RBYTES        (1<<5)
 
 #define CEPH_MOUNT_DEFAULT (CEPH_MOUNT_RBYTES |                \
-                           CEPH_MOUNT_UNSAFE_WRITES)
+                           CEPH_MOUNT_UNSAFE_WRITEBACK) /* just for now */
 
 struct ceph_mount_args {
        int sb_flags;