Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ae7a828 authored by Chengguang Xu's avatar Chengguang Xu Committed by Ilya Dryomov
Browse files

ceph: keep consistent semantic in fscache related option combination 



When specifying multiple fscache related options, the result isn't always
the same as option order, this fix will keep strict consistent meaning
by order.

Signed-off-by: default avatarChengguang Xu <cgxu519@icloud.com>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 4c069a58

fs/ceph/super.c

+4 −0
Original line number Diff line number Diff line
@@ -314,9 +314,13 @@ static int parse_fsopt_token(char *c, void *private) 
		break;

	case Opt_fscache:

		fsopt->flags |= CEPH_MOUNT_OPT_FSCACHE;

		kfree(fsopt->fscache_uniq);

		fsopt->fscache_uniq = NULL;

		break;

	case Opt_nofscache:

		fsopt->flags &= ~CEPH_MOUNT_OPT_FSCACHE;

		kfree(fsopt->fscache_uniq);

		fsopt->fscache_uniq = NULL;

		break;

	case Opt_poolperm:

		fsopt->flags &= ~CEPH_MOUNT_OPT_NOPOOLPERM;