Commit 15517c72 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 002c0aef fdd92b64
...@@ -1716,8 +1716,12 @@ static inline bool may_mount(void) ...@@ -1716,8 +1716,12 @@ static inline bool may_mount(void)
} }
#ifdef CONFIG_MANDATORY_FILE_LOCKING #ifdef CONFIG_MANDATORY_FILE_LOCKING
static inline bool may_mandlock(void) static bool may_mandlock(void)
{ {
pr_warn_once("======================================================\n"
"WARNING: the mand mount option is being deprecated and\n"
" will be removed in v5.15!\n"
"======================================================\n");
return capable(CAP_SYS_ADMIN); return capable(CAP_SYS_ADMIN);
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment