Skip to content

Commit 3b20bc2

Browse files
lxbszidryomov
authored andcommitted
ceph: noacl mount option is effectively ignored
For the old mount API, the module parameters parseing function will be called in ceph_mount() and also just after the default posix acl flag set, so we can control to enable/disable it via the mount option. But for the new mount API, it will call the module parameters parseing function before ceph_get_tree(), so the posix acl will always be enabled. Fixes: 82995cc ("libceph, rbd, ceph: convert to use the new mount API") Signed-off-by: Xiubo Li <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent b27a939 commit 3b20bc2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

fs/ceph/super.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,10 +1032,6 @@ static int ceph_get_tree(struct fs_context *fc)
10321032
if (!fc->source)
10331033
return invalfc(fc, "No source");
10341034

1035-
#ifdef CONFIG_CEPH_FS_POSIX_ACL
1036-
fc->sb_flags |= SB_POSIXACL;
1037-
#endif
1038-
10391035
/* create client (which we may/may not use) */
10401036
fsc = create_fs_client(pctx->opts, pctx->copts);
10411037
pctx->opts = NULL;
@@ -1158,6 +1154,10 @@ static int ceph_init_fs_context(struct fs_context *fc)
11581154
fsopt->max_readdir_bytes = CEPH_MAX_READDIR_BYTES_DEFAULT;
11591155
fsopt->congestion_kb = default_congestion_kb();
11601156

1157+
#ifdef CONFIG_CEPH_FS_POSIX_ACL
1158+
fc->sb_flags |= SB_POSIXACL;
1159+
#endif
1160+
11611161
fc->fs_private = pctx;
11621162
fc->ops = &ceph_context_ops;
11631163
return 0;

0 commit comments

Comments
 (0)