kclient: norbytes mount option; rbytes on by default

diff --git a/src/kernel/mds_client.h b/src/kernel/mds_client.h
index d7d12e8f5a43e3333a3a660e1f64c56b1f6f9e11..75a8d2d23a304f11bce003d21859f3ad52093e76 100644 (file)
--- a/src/kernel/mds_client.h
+++ b/src/kernel/mds_client.h
@@ -51,7 +51,7 @@ enum {
        CEPH_MDS_SESSION_OPENING = 2,
        CEPH_MDS_SESSION_OPEN = 3,
        CEPH_MDS_SESSION_CLOSING = 4,
-       CEPH_MDS_SESSION_RESUMING = 5,
+//     CEPH_MDS_SESSION_RESUMING = 5,
        CEPH_MDS_SESSION_RECONNECTING = 6
 };
 struct ceph_mds_session {

diff --git a/src/kernel/super.c b/src/kernel/super.c
index 30d4557857015bd3ba69a60e85b0b22462fe3df9..186d61dd34bdca4eb0d542672983bc2d8bd834ed 100644 (file)
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -130,6 +130,8 @@ static int ceph_show_options(struct seq_file *m, struct vfsmount *mnt)
                seq_puts(m, ",nodirstat");
        if (args->flags & CEPH_MOUNT_RBYTES)
                seq_puts(m, ",rbytes");
+       else
+               seq_puts(m, ",norbytes");
        return 0;
 }
 
@@ -349,6 +351,7 @@ enum {
        Opt_dirstat,
        Opt_nodirstat,
        Opt_rbytes,
+       Opt_norbytes,
 };
 
 static match_table_t arg_tokens = {
@@ -372,6 +375,7 @@ static match_table_t arg_tokens = {
        {Opt_dirstat, "dirstat"},
        {Opt_nodirstat, "nodirstat"},
        {Opt_rbytes, "rbytes"},
+       {Opt_norbytes, "norbytes"},
        {-1, NULL}
 };
 
@@ -545,6 +549,9 @@ static int parse_mount_args(int flags, char *options, const char *dev_name,
                case Opt_rbytes:
                        args->flags |= CEPH_MOUNT_RBYTES;
                        break;
+               case Opt_norbytes:
+                       args->flags &= ~CEPH_MOUNT_RBYTES;
+                       break;
 
                default:
                        BUG_ON(token);

diff --git a/src/kernel/super.h b/src/kernel/super.h
index df6452889cf5a351d611929c8a3faed9fc345261..c5c932e53e5b8fe53552da357f99378e2b5c7115 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -87,7 +87,9 @@ static inline unsigned long time_sub(unsigned long a, unsigned long b)
 #define CEPH_MOUNT_DIRSTAT       (1<<4)
 #define CEPH_MOUNT_RBYTES        (1<<5)
 
-#define CEPH_MOUNT_DEFAULT (CEPH_MOUNT_DIRSTAT|CEPH_MOUNT_UNSAFE_WRITES)
+#define CEPH_MOUNT_DEFAULT (CEPH_MOUNT_DIRSTAT |       \
+                           CEPH_MOUNT_RBYTES |         \
+                           CEPH_MOUNT_UNSAFE_WRITES)
 
 struct ceph_mount_args {
        int sb_flags;