]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fs: warn about impending deprecation of mandatory locks
authorJeff Layton <jlayton@kernel.org>
Fri, 20 Aug 2021 13:29:50 +0000 (09:29 -0400)
committerSasha Levin <sashal@kernel.org>
Thu, 26 Aug 2021 12:35:19 +0000 (08:35 -0400)
[ Upstream commit fdd92b64d15bc4aec973caa25899afd782402e68 ]

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: stable@vger.kernel.org
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/namespace.c

index caad091fb204dc6109256ba5c328b0dad0d009cb..03770bae9dd503d1282e8199281ad5a3b68898ee 100644 (file)
@@ -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