Skip to content

Commit 15517c7

Browse files
committed
Merge tag 'locks-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull mandatory file locking deprecation warning from Jeff Layton: "As discussed on the list, this patch just adds a new warning for folks who still have mandatory locking enabled and actually mount with '-o mand'. I'd like to get this in for v5.14 so we can push this out into stable kernels and hopefully reach folks who have mounts with -o mand. For now, I'm operating under the assumption that we'll fully remove this support in v5.15, but we can move that out if any legitimate users of this facility speak up between now and then" * tag 'locks-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux: fs: warn about impending deprecation of mandatory locks
2 parents 002c0ae + fdd92b6 commit 15517c7

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

fs/namespace.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1716,8 +1716,12 @@ static inline bool may_mount(void)
17161716
}
17171717

17181718
#ifdef CONFIG_MANDATORY_FILE_LOCKING
1719-
static inline bool may_mandlock(void)
1719+
static bool may_mandlock(void)
17201720
{
1721+
pr_warn_once("======================================================\n"
1722+
"WARNING: the mand mount option is being deprecated and\n"
1723+
" will be removed in v5.15!\n"
1724+
"======================================================\n");
17211725
return capable(CAP_SYS_ADMIN);
17221726
}
17231727
#else

0 commit comments

Comments
 (0)