Skip to content

Commit

Permalink
fs: warn about impending deprecation of mandatory locks
Browse files Browse the repository at this point in the history
We've had CONFIG_MANDATORY_FILE_LOCKING since 2015 and a lot of distros
have disabled it. Warn the stragglers that still use "-o mand" that
we'll be dropping support for that mount option.

Cc: [email protected]
Signed-off-by: Jeff Layton <[email protected]>
  • Loading branch information
jtlayton committed Aug 21, 2021
1 parent 3dbdb38 commit fdd92b6
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion fs/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1716,8 +1716,12 @@ static inline bool may_mount(void)
}

#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);
}
#else
Expand Down

0 comments on commit fdd92b6

Please sign in to comment.