[Cluster-devel] [PATCH v2 5/5] ocfs2: convert to use i_blockmask()

[Yangtao Li]

Use i_blockmask() to simplify code. BTW convert ocfs2_is_io_unaligned
to return bool type.

Signed-off-by: Yangtao Li <frank...@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