mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH v3 4/7] fs: do not compare against ->llseek
Date: Wed, 29 Jun 2022 15:06:59 +0200	[thread overview]
Message-ID: <20220629130702.954310-5-Jason@zx2c4.com> (raw)
In-Reply-To: <20220629130702.954310-1-Jason@zx2c4.com>

Now we can rely on llseek being functional (via vfs_llseek) if
FMODE_LSEEK is set, so remove the old broken comparisons.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 fs/coredump.c          | 4 ++--
 fs/overlayfs/copy_up.c | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/coredump.c b/fs/coredump.c
index ebc43f960b64..9f4aae202109 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -816,9 +816,9 @@ static int __dump_skip(struct coredump_params *cprm, size_t nr)
 {
 	static char zeroes[PAGE_SIZE];
 	struct file *file = cprm->file;
-	if (file->f_op->llseek && file->f_op->llseek != no_llseek) {
+	if (file->f_mode & FMODE_LSEEK) {
 		if (dump_interrupted() ||
-		    file->f_op->llseek(file, nr, SEEK_CUR) < 0)
+		    vfs_llseek(file, nr, SEEK_CUR) < 0)
 			return 0;
 		cprm->pos += nr;
 		return 1;
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 714ec569d25b..022606c9703b 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -226,8 +226,7 @@ static int ovl_copy_up_data(struct ovl_fs *ofs, struct path *old,
 	/* Couldn't clone, so now we try to copy the data */
 
 	/* Check if lower fs supports seek operation */
-	if (old_file->f_mode & FMODE_LSEEK &&
-	    old_file->f_op->llseek)
+	if (old_file->f_mode & FMODE_LSEEK)
 		skip_hole = true;
 
 	while (len) {
-- 
2.35.1


  parent reply	other threads:[~2022-06-29 13:08 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-29 13:06 [PATCH v3 0/7] cleanup llseek and splice Jason A. Donenfeld
2022-06-29 13:06 ` [PATCH v3 1/7] fs: do not set no_llseek in fops Jason A. Donenfeld
2022-06-29 13:06 ` [PATCH v3 2/7] fs: clear or set FMODE_LSEEK based on llseek function Jason A. Donenfeld
2022-06-29 13:06 ` [PATCH v3 3/7] fs: check FMODE_LSEEK to control internal pipe splicing Jason A. Donenfeld
2022-06-29 13:06 ` Jason A. Donenfeld [this message]
2022-06-29 13:07 ` [PATCH v3 5/7] fs: remove no_llseek Jason A. Donenfeld
2022-06-30  6:45   ` Nikolay Borisov
2022-06-30 13:50     ` Jason A. Donenfeld
2022-06-29 13:07 ` [PATCH v3 6/7] dma-buf: remove useless FMODE_LSEEK flag Jason A. Donenfeld
2022-06-29 13:07 ` [PATCH v3 7/7] vfio: do not set " Jason A. Donenfeld

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=20220629130702.954310-5-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /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

all inboxes | Powered by JetHome®