aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ceph/super.c')
-rw-r--r--fs/ceph/super.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index b382e5910eea..537f96631785 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -137,6 +137,8 @@ enum {
137 Opt_nofscache, 137 Opt_nofscache,
138 Opt_poolperm, 138 Opt_poolperm,
139 Opt_nopoolperm, 139 Opt_nopoolperm,
140 Opt_require_active_mds,
141 Opt_norequire_active_mds,
140#ifdef CONFIG_CEPH_FS_POSIX_ACL 142#ifdef CONFIG_CEPH_FS_POSIX_ACL
141 Opt_acl, 143 Opt_acl,
142#endif 144#endif
@@ -171,6 +173,8 @@ static match_table_t fsopt_tokens = {
171 {Opt_nofscache, "nofsc"}, 173 {Opt_nofscache, "nofsc"},
172 {Opt_poolperm, "poolperm"}, 174 {Opt_poolperm, "poolperm"},
173 {Opt_nopoolperm, "nopoolperm"}, 175 {Opt_nopoolperm, "nopoolperm"},
176 {Opt_require_active_mds, "require_active_mds"},
177 {Opt_norequire_active_mds, "norequire_active_mds"},
174#ifdef CONFIG_CEPH_FS_POSIX_ACL 178#ifdef CONFIG_CEPH_FS_POSIX_ACL
175 {Opt_acl, "acl"}, 179 {Opt_acl, "acl"},
176#endif 180#endif
@@ -287,6 +291,12 @@ static int parse_fsopt_token(char *c, void *private)
287 case Opt_nopoolperm: 291 case Opt_nopoolperm:
288 fsopt->flags |= CEPH_MOUNT_OPT_NOPOOLPERM; 292 fsopt->flags |= CEPH_MOUNT_OPT_NOPOOLPERM;
289 break; 293 break;
294 case Opt_require_active_mds:
295 fsopt->flags &= ~CEPH_MOUNT_OPT_MOUNTWAIT;
296 break;
297 case Opt_norequire_active_mds:
298 fsopt->flags |= CEPH_MOUNT_OPT_MOUNTWAIT;
299 break;
290#ifdef CONFIG_CEPH_FS_POSIX_ACL 300#ifdef CONFIG_CEPH_FS_POSIX_ACL
291 case Opt_acl: 301 case Opt_acl:
292 fsopt->sb_flags |= MS_POSIXACL; 302 fsopt->sb_flags |= MS_POSIXACL;