From: Al Viro <viro@zeniv.linux.org.uk>
To: Jeff Layton <jlayton@kernel.org>
Cc: bfields@fieldses.org, linux-nfs@vger.kernel.org,
david@redhat.com, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, cluster-devel@redhat.com,
linux-mm@kvack.org, rostedt@goodmis.org, ebiederm@xmission.com,
luto@kernel.org, linux-fsdevel@vger.kernel.org,
v9fs-developer@lists.sourceforge.net,
torvalds@linux-foundation.org, linux-afs@lists.infradead.org,
ocfs2-devel@oss.oracle.com
Subject: Re: [Ocfs2-devel] [PATCH v3 2/2] fs: remove mandatory file locking support
Date: Fri, 20 Aug 2021 19:45:26 +0000 [thread overview]
Message-ID: <YSAGVsTOc/Fw0x8l@zeniv-ca.linux.org.uk> (raw)
In-Reply-To: <20210820163919.435135-3-jlayton@kernel.org>
On Fri, Aug 20, 2021 at 12:39:19PM -0400, Jeff Layton wrote:
> diff --git a/fs/locks.c b/fs/locks.c
> @@ -2857,8 +2744,7 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
> seq_puts(f, "POSIX ");
>
> seq_printf(f, " %s ",
> - (inode == NULL) ? "*NOINODE*" :
> - mandatory_lock(inode) ? "MANDATORY" : "ADVISORY ");
> + (inode == NULL) ? "*NOINODE*" : "ADVISORY ");
Huh?
<looks>
if (fl->fl_file != NULL)
inode = locks_inode(fl->fl_file);
So basically that's fl->fl_file ? "ADVISORY" : "*NOINODE*"?
How could that trigger, though? With locks_mandatory_area() gone, I don't
see how FL_POSIX file_lock with NULL ->fl_file could be ever found...
Confused...
Why is locks_copy_conflock() exported (hell, non-static), BTW?
> diff --git a/fs/namespace.c b/fs/namespace.c
> -#ifdef CONFIG_MANDATORY_FILE_LOCKING
> -static bool may_mandlock(void)
> +static void warn_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);
> + pr_warn_once("=======================================================\n"
> + "WARNING: The mand mount option has been deprecated and\n"
> + " and is ignored by this kernel. Remove the mand\n"
> + " option from the mount to silence this warning.\n"
> + "=======================================================\n");
> }
> -#else
> -static inline bool may_mandlock(void)
> -{
> - pr_warn("VFS: \"mand\" mount option not supported");
> - return false;
> -}
> -#endif
Is there any point in having the previous patch not folded into this one?
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2021-08-20 19:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-20 16:39 [Ocfs2-devel] [PATCH v3 0/2] fs: remove support for mandatory locking Jeff Layton
2021-08-20 16:39 ` [Ocfs2-devel] [PATCH v3 1/2] fs: warn about impending deprecation of mandatory locks Jeff Layton
2021-08-20 16:39 ` [Ocfs2-devel] [PATCH v3 2/2] fs: remove mandatory file locking support Jeff Layton
2021-08-20 19:45 ` Al Viro [this message]
2021-08-23 15:12 ` Guenter Roeck
2021-08-20 18:15 ` [Ocfs2-devel] [PATCH v3 0/2] fs: remove support for mandatory locking Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YSAGVsTOc/Fw0x8l@zeniv-ca.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=bfields@fieldses.org \
--cc=cluster-devel@redhat.com \
--cc=david@redhat.com \
--cc=ebiederm@xmission.com \
--cc=jlayton@kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=luto@kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
--cc=rostedt@goodmis.org \
--cc=torvalds@linux-foundation.org \
--cc=v9fs-developer@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).