2022-03-17 06:25:43

by Jiapeng Chong

[permalink] [raw]
Subject: [PATCH] ufs: clean up some inconsistent indenting

Eliminate the follow smatch warning:

fs/ufs/inode.c:1071 ufs_alloc_lastblock() warn: inconsistent indenting.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
fs/ufs/inode.c | 72 +++++++++++++++++++++++++-------------------------
1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index d0dda01620f0..508eeefdfa0d 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -1068,52 +1068,52 @@ static int ufs_alloc_lastblock(struct inode *inode, loff_t size)

lastpage = ufs_get_locked_page(mapping, lastfrag >>
(PAGE_SHIFT - inode->i_blkbits));
- if (IS_ERR(lastpage)) {
- err = -EIO;
- goto out;
- }
+ if (IS_ERR(lastpage)) {
+ err = -EIO;
+ goto out;
+ }

- end = lastfrag & ((1 << (PAGE_SHIFT - inode->i_blkbits)) - 1);
- bh = page_buffers(lastpage);
- for (i = 0; i < end; ++i)
- bh = bh->b_this_page;
+ end = lastfrag & ((1 << (PAGE_SHIFT - inode->i_blkbits)) - 1);
+ bh = page_buffers(lastpage);
+ for (i = 0; i < end; ++i)
+ bh = bh->b_this_page;


- err = ufs_getfrag_block(inode, lastfrag, bh, 1);
+ err = ufs_getfrag_block(inode, lastfrag, bh, 1);

- if (unlikely(err))
- goto out_unlock;
+ if (unlikely(err))
+ goto out_unlock;

- if (buffer_new(bh)) {
- clear_buffer_new(bh);
- clean_bdev_bh_alias(bh);
- /*
+ if (buffer_new(bh)) {
+ clear_buffer_new(bh);
+ clean_bdev_bh_alias(bh);
+ /*
* we do not zeroize fragment, because of
* if it maped to hole, it already contains zeroes
*/
- set_buffer_uptodate(bh);
- mark_buffer_dirty(bh);
- set_page_dirty(lastpage);
- }
-
- if (lastfrag >= UFS_IND_FRAGMENT) {
- end = uspi->s_fpb - ufs_fragnum(lastfrag) - 1;
- phys64 = bh->b_blocknr + 1;
- for (i = 0; i < end; ++i) {
- bh = sb_getblk(sb, i + phys64);
- lock_buffer(bh);
- memset(bh->b_data, 0, sb->s_blocksize);
- set_buffer_uptodate(bh);
- mark_buffer_dirty(bh);
- unlock_buffer(bh);
- sync_dirty_buffer(bh);
- brelse(bh);
- }
- }
+ set_buffer_uptodate(bh);
+ mark_buffer_dirty(bh);
+ set_page_dirty(lastpage);
+ }
+
+ if (lastfrag >= UFS_IND_FRAGMENT) {
+ end = uspi->s_fpb - ufs_fragnum(lastfrag) - 1;
+ phys64 = bh->b_blocknr + 1;
+ for (i = 0; i < end; ++i) {
+ bh = sb_getblk(sb, i + phys64);
+ lock_buffer(bh);
+ memset(bh->b_data, 0, sb->s_blocksize);
+ set_buffer_uptodate(bh);
+ mark_buffer_dirty(bh);
+ unlock_buffer(bh);
+ sync_dirty_buffer(bh);
+ brelse(bh);
+ }
+ }
out_unlock:
- ufs_put_locked_page(lastpage);
+ ufs_put_locked_page(lastpage);
out:
- return err;
+ return err;
}

static void ufs_truncate_blocks(struct inode *inode)
--
2.20.1.7.g153144c