1 files changed, 26 insertions, 9 deletions

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index b33082e6878f..95a3b3ac9b6e 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -45,7 +45,7 @@ static void ceph_put_super(struct super_block *s)
 static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
         struct ceph_fs_client *fsc = ceph_inode_to_client(d_inode(dentry));
-        struct ceph_monmap *monmap = fsc->client->monc.monmap;
+        struct ceph_mon_client *monc = &fsc->client->monc;
         struct ceph_statfs st;
         u64 fsid;
         int err;
@@ -58,7 +58,7 @@ static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf)
         }
 
         dout("statfs\n");
-        err = ceph_monc_do_statfs(&fsc->client->monc, data_pool, &st);
+        err = ceph_monc_do_statfs(monc, data_pool, &st);
         if (err < 0)
                 return err;
 
@@ -94,8 +94,11 @@ static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf)
         buf->f_namelen = NAME_MAX;
 
         /* Must convert the fsid, for consistent values across arches */
-        fsid = le64_to_cpu(*(__le64 *)(&monmap->fsid)) ^
-               le64_to_cpu(*((__le64 *)&monmap->fsid + 1));
+        mutex_lock(&monc->mutex);
+        fsid = le64_to_cpu(*(__le64 *)(&monc->monmap->fsid)) ^
+               le64_to_cpu(*((__le64 *)&monc->monmap->fsid + 1));
+        mutex_unlock(&monc->mutex);
+
         buf->f_fsid.val[0] = fsid & 0xffffffff;
         buf->f_fsid.val[1] = fsid >> 32;
 
@@ -256,19 +259,19 @@ static int parse_fsopt_token(char *c, void *private)
                 break;
                 /* misc */
         case Opt_wsize:
-                if (intval < PAGE_SIZE || intval > CEPH_MAX_WRITE_SIZE)
+                if (intval < (int)PAGE_SIZE || intval > CEPH_MAX_WRITE_SIZE)
                         return -EINVAL;
                 fsopt->wsize = ALIGN(intval, PAGE_SIZE);
                 break;
         case Opt_rsize:
-                if (intval < PAGE_SIZE || intval > CEPH_MAX_READ_SIZE)
+                if (intval < (int)PAGE_SIZE || intval > CEPH_MAX_READ_SIZE)
                         return -EINVAL;
                 fsopt->rsize = ALIGN(intval, PAGE_SIZE);
                 break;
         case Opt_rasize:
                 if (intval < 0)
                         return -EINVAL;
-                fsopt->rasize = ALIGN(intval + PAGE_SIZE - 1, PAGE_SIZE);
+                fsopt->rasize = ALIGN(intval, PAGE_SIZE);
                 break;
         case Opt_caps_wanted_delay_min:
                 if (intval < 1)
@@ -286,7 +289,7 @@ static int parse_fsopt_token(char *c, void *private)
                 fsopt->max_readdir = intval;
                 break;
         case Opt_readdir_max_bytes:
-                if (intval < PAGE_SIZE && intval != 0)
+                if (intval < (int)PAGE_SIZE && intval != 0)
                         return -EINVAL;
                 fsopt->max_readdir_bytes = intval;
                 break;
@@ -534,6 +537,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
                 seq_puts(m, ",noasyncreaddir");
         if ((fsopt->flags & CEPH_MOUNT_OPT_DCACHE) == 0)
                 seq_puts(m, ",nodcache");
+        if (fsopt->flags & CEPH_MOUNT_OPT_INO32)
+                seq_puts(m, ",ino32");
         if (fsopt->flags & CEPH_MOUNT_OPT_FSCACHE) {
                 seq_show_option(m, "fsc", fsopt->fscache_uniq);
         }
@@ -551,7 +556,7 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
 
         if (fsopt->mds_namespace)
                 seq_show_option(m, "mds_namespace", fsopt->mds_namespace);
-        if (fsopt->wsize)
+        if (fsopt->wsize != CEPH_MAX_WRITE_SIZE)
                 seq_printf(m, ",wsize=%d", fsopt->wsize);
         if (fsopt->rsize != CEPH_MAX_READ_SIZE)
                 seq_printf(m, ",rsize=%d", fsopt->rsize);
@@ -616,7 +621,9 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt,
                 err = PTR_ERR(fsc->client);
                 goto fail;
         }
+
         fsc->client->extra_mon_dispatch = extra_mon_dispatch;
+        fsc->client->osdc.abort_on_full = true;
 
         if (!fsopt->mds_namespace) {
                 ceph_monc_want_map(&fsc->client->monc, CEPH_SUB_MDSMAP,
@@ -674,6 +681,13 @@ fail:
         return ERR_PTR(err);
 }
 
+static void flush_fs_workqueues(struct ceph_fs_client *fsc)
+{
+        flush_workqueue(fsc->wb_wq);
+        flush_workqueue(fsc->pg_inv_wq);
+        flush_workqueue(fsc->trunc_wq);
+}
+
 static void destroy_fs_client(struct ceph_fs_client *fsc)
 {
         dout("destroy_fs_client %p\n", fsc);
@@ -793,6 +807,7 @@ static void ceph_umount_begin(struct super_block *sb)
         if (!fsc)
                 return;
         fsc->mount_state = CEPH_MOUNT_SHUTDOWN;
+        ceph_osdc_abort_requests(&fsc->client->osdc, -EIO);
         ceph_mdsc_force_umount(fsc->mdsc);
         return;
 }
@@ -1088,6 +1103,8 @@ static void ceph_kill_sb(struct super_block *s)
         dout("kill_sb %p\n", s);
 
         ceph_mdsc_pre_umount(fsc->mdsc);
+        flush_fs_workqueues(fsc);
+
         generic_shutdown_super(s);
 
         fsc->client->extra_mon_dispatch = NULL;