linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] fs: remove leftover comments from mandatory locking removal
@ 2021-10-26 16:24 Jeff Layton
  0 siblings, 0 replies; only message in thread
From: Jeff Layton @ 2021-10-26 16:24 UTC (permalink / raw)
  To: viro; +Cc: bfields, linux-fsdevel, linux-kernel

Stragglers from commit f7e33bdbd6d1 ("fs: remove mandatory file locking
support").

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/namei.c      | 4 +---
 fs/read_write.c | 4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)

Al, I'll plan to merge this along with my locking changes for v5.16. Let
me know if you'd prefer it to go in via your vfs tree.

Thanks,
Jeff

diff --git a/fs/namei.c b/fs/namei.c
index 95a881e0552b..b05e6840df74 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3074,9 +3074,7 @@ static int handle_truncate(struct user_namespace *mnt_userns, struct file *filp)
 	int error = get_write_access(inode);
 	if (error)
 		return error;
-	/*
-	 * Refuse to truncate files with mandatory locks held on them.
-	 */
+
 	error = security_path_truncate(path);
 	if (!error) {
 		error = do_truncate(mnt_userns, path->dentry, 0,
diff --git a/fs/read_write.c b/fs/read_write.c
index af057c57bdc6..0074afa7ecb3 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -368,10 +368,6 @@ int rw_verify_area(int read_write, struct file *file, const loff_t *ppos, size_t
 	if (unlikely((ssize_t) count < 0))
 		return -EINVAL;
 
-	/*
-	 * ranged mandatory locking does not apply to streams - it makes sense
-	 * only for files where position has a meaning.
-	 */
 	if (ppos) {
 		loff_t pos = *ppos;
 
-- 
2.31.1


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-10-26 16:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-26 16:24 [PATCH] fs: remove leftover comments from mandatory locking removal Jeff Layton

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).