From: Xiubo Li <xiubli@xxxxxxxxxx>
This will enable the remount and reconfiguring superblock params
for the fs. Currently some mount options are not allowed to be
reconfigured.
It will working like:
$ mount.ceph :/ /mnt/cephfs -o remount,mount_timeout=100
URL:https://tracker.ceph.com/issues/44071
Signed-off-by: Xiubo Li <xiubli@xxxxxxxxxx>
---
block/bfq-cgroup.c | 1 +
drivers/block/rbd.c | 2 +-
fs/ceph/caps.c | 2 +
fs/ceph/mds_client.c | 5 +-
fs/ceph/super.c | 126 +++++++++++++++++++++++++++++------
fs/ceph/super.h | 2 +
include/linux/ceph/libceph.h | 4 +-
net/ceph/ceph_common.c | 83 ++++++++++++++++++++---
8 files changed, 192 insertions(+), 33 deletions(-)
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index e1419edde2ec..b3d42200182e 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -12,6 +12,7 @@
#include <linux/ioprio.h>
#include <linux/sbitmap.h>
#include <linux/delay.h>
+#include <linux/rbtree.h>
#include "bfq-iosched.h"
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4e494d5600cc..470de27cf809 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -6573,7 +6573,7 @@ static int rbd_add_parse_args(const char *buf,
*(snap_name + len) = '\0';
pctx.spec->snap_name = snap_name;
- pctx.copts = ceph_alloc_options();
+ pctx.copts = ceph_alloc_options(NULL);
if (!pctx.copts)
goto out_mem;
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index b4f122eb74bb..020f83186f94 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -491,10 +491,12 @@ static void __cap_set_timeouts(struct ceph_mds_client *mdsc,
{
struct ceph_mount_options *opt = mdsc->fsc->mount_options;
+ spin_lock(&opt->ceph_opt_lock);
ci->i_hold_caps_min = round_jiffies(jiffies +
opt->caps_wanted_delay_min * HZ);
ci->i_hold_caps_max = round_jiffies(jiffies +
opt->caps_wanted_delay_max * HZ);
+ spin_unlock(&opt->ceph_opt_lock);
dout("__cap_set_timeouts %p min %lu max %lu\n", &ci->vfs_inode,
ci->i_hold_caps_min - jiffies, ci->i_hold_caps_max - jiffies);
}
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 376e7cf1685f..451c3727cd0b 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2099,6 +2099,7 @@ int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req,
struct ceph_inode_info *ci = ceph_inode(dir);
struct ceph_mds_reply_info_parsed *rinfo = &req->r_reply_info;
struct ceph_mount_options *opt = req->r_mdsc->fsc->mount_options;
+ unsigned int max_readdir = opt->max_readdir;
size_t size = sizeof(struct ceph_mds_reply_dir_entry);
unsigned int num_entries;
int order;
@@ -2107,7 +2108,7 @@ int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req,
num_entries = ci->i_files + ci->i_subdirs;
spin_unlock(&ci->i_ceph_lock);
num_entries = max(num_entries, 1U);
- num_entries = min(num_entries, opt->max_readdir);
+ num_entries = min(num_entries, max_readdir);
order = get_order(size * num_entries);
while (order >= 0) {
@@ -2122,7 +2123,7 @@ int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req,
return -ENOMEM;
num_entries = (PAGE_SIZE << order) / size;
- num_entries = min(num_entries, opt->max_readdir);
+ num_entries = min(num_entries, max_readdir);
rinfo->dir_buf_size = PAGE_SIZE << order;
req->r_num_caps = num_entries + 1;
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 9a21054059f2..8df506dd9039 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -1175,7 +1175,57 @@ static void ceph_free_fc(struct fs_context *fc)
static int ceph_reconfigure_fc(struct fs_context *fc)
{
- sync_filesystem(fc->root->d_sb);
+ struct super_block *sb = fc->root->d_sb;
+ struct ceph_fs_client *fsc = ceph_sb_to_client(sb);
+ struct ceph_mount_options *fsopt = fsc->mount_options;
+ struct ceph_parse_opts_ctx *pctx = fc->fs_private;
+ struct ceph_mount_options *new_fsopt = pctx->opts;
+ int ret;
+
+ sync_filesystem(sb);
+
+ ret = ceph_reconfigure_copts(fc, pctx->copts, fsc->client->options);
+ if (ret)
+ return ret;
+
+ if (new_fsopt->snapdir_name != fsopt->snapdir_name)
+ return invalf(fc, "ceph: reconfiguration of snapdir_name not allowed");
+
+ if (new_fsopt->mds_namespace != fsopt->mds_namespace)
+ return invalf(fc, "ceph: reconfiguration of mds_namespace not allowed");
+
+ if (new_fsopt->wsize != fsopt->wsize)
+ return invalf(fc, "ceph: reconfiguration of wsize not allowed");
+ if (new_fsopt->rsize != fsopt->rsize)
+ return invalf(fc, "ceph: reconfiguration of rsize not allowed");
+ if (new_fsopt->rasize != fsopt->rasize)
+ return invalf(fc, "ceph: reconfiguration of rasize not allowed");
+
