linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: linux-ext4@vger.kernel.org
Subject: [PATCH 3/8] ext4: remove redundant S_ISREG() checks from ext4_fallocate()
Date: Tue, 31 Dec 2019 12:04:39 -0600	[thread overview]
Message-ID: <20191231180444.46586-4-ebiggers@kernel.org> (raw)
In-Reply-To: <20191231180444.46586-1-ebiggers@kernel.org>

From: Eric Biggers <ebiggers@google.com>

ext4_fallocate() is only used in the file_operations for regular files.
Also, the VFS only allows fallocate() on regular files and block
devices, but block devices always use blkdev_fallocate().  For both of
these reasons, S_ISREG() is always true in ext4_fallocate().

Therefore the S_ISREG() checks in ext4_zero_range(),
ext4_collapse_range(), ext4_insert_range(), and ext4_punch_hole() are
redundant.  Remove them.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/ext4/extents.c | 9 ---------
 fs/ext4/inode.c   | 3 ---
 2 files changed, 12 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 21d39758d522..296ad7fcc302 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4673,9 +4673,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,
 
 	trace_ext4_zero_range(inode, offset, len, mode);
 
-	if (!S_ISREG(inode->i_mode))
-		return -EINVAL;
-
 	/* Call ext4_force_commit to flush all data in case of data=journal. */
 	if (ext4_should_journal_data(inode)) {
 		ret = ext4_force_commit(inode->i_sb);
@@ -5438,9 +5435,6 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len)
 	if (!IS_ALIGNED(offset | len, EXT4_CLUSTER_SIZE(sb)))
 		return -EINVAL;
 
-	if (!S_ISREG(inode->i_mode))
-		return -EINVAL;
-
 	trace_ext4_collapse_range(inode, offset, len);
 
 	punch_start = offset >> EXT4_BLOCK_SIZE_BITS(sb);
@@ -5587,9 +5581,6 @@ int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len)
 	if (!IS_ALIGNED(offset | len, EXT4_CLUSTER_SIZE(sb)))
 		return -EINVAL;
 
-	if (!S_ISREG(inode->i_mode))
-		return -EOPNOTSUPP;
-
 	trace_ext4_insert_range(inode, offset, len);
 
 	offset_lblk = offset >> EXT4_BLOCK_SIZE_BITS(sb);
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 6586b29e9f2f..32ab4d4074be 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3916,9 +3916,6 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)
 	unsigned int credits;
 	int ret = 0;
 
-	if (!S_ISREG(inode->i_mode))
-		return -EOPNOTSUPP;
-
 	trace_ext4_punch_hole(inode, offset, length, 0);
 
 	ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
-- 
2.24.1


  parent reply	other threads:[~2019-12-31 18:06 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-31 18:04 [PATCH 0/8] ext4: extents.c cleanups Eric Biggers
2019-12-31 18:04 ` [PATCH 1/8] ext4: remove ext4_{ind,ext}_calc_metadata_amount() Eric Biggers
2019-12-31 18:04 ` [PATCH 2/8] ext4: clean up len and offset checks in ext4_fallocate() Eric Biggers
2019-12-31 18:04 ` Eric Biggers [this message]
2019-12-31 18:04 ` [PATCH 4/8] ext4: make some functions static in extents.c Eric Biggers
2019-12-31 18:04 ` [PATCH 5/8] ext4: fix documentation for ext4_ext_try_to_merge() Eric Biggers
2019-12-31 18:04 ` [PATCH 6/8] ext4: remove obsolete comment from ext4_can_extents_be_merged() Eric Biggers
2019-12-31 18:04 ` [PATCH 7/8] ext4: fix some nonstandard indentation in extents.c Eric Biggers
2019-12-31 18:04 ` [PATCH 8/8] ext4: add missing braces in ext4_ext_drop_refs() Eric Biggers
2020-01-01  9:36 ` [PATCH 1/1] ext4: remove unsed macro MPAGE_DA_EXTENT_TAIL Ritesh Harjani
2020-01-01  9:46   ` Ritesh Harjani
2020-01-01  9:51 ` [PATCH 1/1] ext4: remove unused " Ritesh Harjani
2020-01-07  9:55   ` Jan Kara
2020-01-13 21:42     ` Theodore Y. Ts'o
2020-01-01  9:52 ` [PATCH 0/8] ext4: extents.c cleanups Ritesh Harjani
2020-01-07  9:56 ` Jan Kara
2020-01-13 21:32 ` Theodore Y. Ts'o

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=20191231180444.46586-4-ebiggers@kernel.org \
    --to=ebiggers@kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    /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).