Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04447026 authored by Fabian Frederick's avatar Fabian Frederick Committed by Greg Kroah-Hartman
Browse files

fs: add i_blocksize() 

commit 93407472a21b82f39c955ea7787e5bc7da100642 upstream.

Replace all 1 << inode->i_blkbits and (1 << inode->i_blkbits) in fs
branch.

This patch also fixes multiple checkpatch warnings: WARNING: Prefer
'unsigned int' to bare use of 'unsigned'

Thanks to Andrew Morton for suggesting more appropriate function instead
of macro.

[geliangtang@gmail.com: truncate: use i_blocksize()]
  Link: http://lkml.kernel.org/r/9c8b2cd83c8f5653805d43debde9fa8817e02fc4.1484895804.git.geliangtang@gmail.com
Link: http://lkml.kernel.org/r/1481319905-10126-1-git-send-email-fabf@skynet.be


Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c8acec90

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -2771,7 +2771,7 @@ static long btrfs_fallocate(struct file *file, int mode, 
		if (!ret)

			ret = btrfs_prealloc_file_range(inode, mode,

					range->start,

					range->len, 1 << inode->i_blkbits,

					range->len, i_blocksize(inode),

					offset + len, &alloc_hint);

		list_del(&range->list);

		kfree(range);

fs/buffer.c

+6 −6
Original line number Diff line number Diff line
@@ -2298,7 +2298,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping, 
			    loff_t pos, loff_t *bytes)

{

	struct inode *inode = mapping->host;

	unsigned blocksize = 1 << inode->i_blkbits;

	unsigned int blocksize = i_blocksize(inode);

	struct page *page;

	void *fsdata;

	pgoff_t index, curidx;
@@ -2378,8 +2378,8 @@ int cont_write_begin(struct file *file, struct address_space *mapping, 
			get_block_t *get_block, loff_t *bytes)

{

	struct inode *inode = mapping->host;

	unsigned blocksize = 1 << inode->i_blkbits;

	unsigned zerofrom;

	unsigned int blocksize = i_blocksize(inode);

	unsigned int zerofrom;

	int err;



	err = cont_expand_zero(file, mapping, pos, bytes);
@@ -2741,7 +2741,7 @@ int nobh_truncate_page(struct address_space *mapping, 
	struct buffer_head map_bh;

	int err;



	blocksize = 1 << inode->i_blkbits;

	blocksize = i_blocksize(inode);

	length = offset & (blocksize - 1);



	/* Block boundary? Nothing to do */
@@ -2819,7 +2819,7 @@ int block_truncate_page(struct address_space *mapping, 
	struct buffer_head *bh;

	int err;



	blocksize = 1 << inode->i_blkbits;

	blocksize = i_blocksize(inode);

	length = offset & (blocksize - 1);



	/* Block boundary? Nothing to do */
@@ -2931,7 +2931,7 @@ sector_t generic_block_bmap(struct address_space *mapping, sector_t block, 
	struct inode *inode = mapping->host;

	tmp.b_state = 0;

	tmp.b_blocknr = 0;

	tmp.b_size = 1 << inode->i_blkbits;

	tmp.b_size = i_blocksize(inode);

	get_block(inode, block, &tmp, 0);

	return tmp.b_blocknr;

}

fs/ceph/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ static int ceph_writepages_start(struct address_space *mapping, 
	struct pagevec pvec;

	int done = 0;

	int rc = 0;

	unsigned wsize = 1 << inode->i_blkbits;

	unsigned int wsize = i_blocksize(inode);

	struct ceph_osd_request *req = NULL;

	int do_sync = 0;

	loff_t snap_size, i_size;

fs/direct-io.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static int dio_set_defer_completion(struct dio *dio) 
/*

 * Call into the fs to map some more disk blocks.  We record the current number

 * of available blocks at sdio->blocks_available.  These are in units of the

 * fs blocksize, (1 << inode->i_blkbits).

 * fs blocksize, i_blocksize(inode).

 *

 * The fs is allowed to map lots of blocks at once.  If it wants to do that,

 * it uses the passed inode-relative block number as the file offset, as usual.

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2044,7 +2044,7 @@ static int mpage_process_page_bufs(struct mpage_da_data *mpd, 
{

	struct inode *inode = mpd->inode;

	int err;

	ext4_lblk_t blocks = (i_size_read(inode) + (1 << inode->i_blkbits) - 1)

	ext4_lblk_t blocks = (i_size_read(inode) + i_blocksize(inode) - 1)

							>> inode->i_blkbits;



	do {