From: Yangtao Li <frank.li@vivo.com>
To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com,
jefflexu@linux.alibaba.com, tytso@mit.edu,
adilger.kernel@dilger.ca, rpeterso@redhat.com,
agruenba@redhat.com, mark@fasheh.com, jlbec@evilplan.org,
joseph.qi@linux.alibaba.com, viro@zeniv.linux.org.uk,
brauner@kernel.org
Cc: linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org,
linux-ext4@vger.kernel.org, cluster-devel@redhat.com,
ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org,
Yangtao Li <frank.li@vivo.com>
Subject: [PATCH v2 5/5] ocfs2: convert to use i_blockmask()
Date: Thu, 9 Mar 2023 20:40:35 +0800 [thread overview]
Message-ID: <20230309124035.15820-5-frank.li@vivo.com> (raw)
In-Reply-To: <20230309124035.15820-1-frank.li@vivo.com>
Use i_blockmask() to simplify code. BTW convert ocfs2_is_io_unaligned
to return bool type.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
fs/ocfs2/file.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index efb09de4343d..baefab3b12c9 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2159,14 +2159,14 @@ int ocfs2_check_range_for_refcount(struct inode *inode, loff_t pos,
return ret;
}
-static int ocfs2_is_io_unaligned(struct inode *inode, size_t count, loff_t pos)
+static bool ocfs2_is_io_unaligned(struct inode *inode, size_t count, loff_t pos)
{
- int blockmask = inode->i_sb->s_blocksize - 1;
+ int blockmask = i_blockmask(inode);
loff_t final_size = pos + count;
if ((pos & blockmask) || (final_size & blockmask))
- return 1;
- return 0;
+ return true;
+ return false;
}
static int ocfs2_inode_lock_for_extent_tree(struct inode *inode,
--
2.25.1
next prev parent reply other threads:[~2023-03-09 12:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-09 12:40 [PATCH v2 1/5] fs: add i_blockmask() Yangtao Li
2023-03-09 12:40 ` [PATCH v2 2/5] erofs: convert to use i_blockmask() Yangtao Li
2023-03-09 12:40 ` [PATCH v2 3/5] gfs2: " Yangtao Li
2023-03-09 12:40 ` [PATCH v2 4/5] ext4: " Yangtao Li
2023-03-09 12:40 ` Yangtao Li [this message]
2023-03-09 14:58 ` [PATCH v2 1/5] fs: add i_blockmask() Christian Brauner
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=20230309124035.15820-5-frank.li@vivo.com \
--to=frank.li@vivo.com \
--cc=adilger.kernel@dilger.ca \
--cc=agruenba@redhat.com \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=cluster-devel@redhat.com \
--cc=huyue2@coolpad.com \
--cc=jefflexu@linux.alibaba.com \
--cc=jlbec@evilplan.org \
--cc=joseph.qi@linux.alibaba.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=rpeterso@redhat.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=xiang@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