android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[GFS2] Remove function gfs2_get_block

Browse Source 
This patch is just a cleanup.  Function gfs2_get_block() just calls
function gfs2_block_map reversing the last two parameters.  By
reversing the parameters, gfs2_block_map() may be called directly
and function gfs2_get_block may be eliminated altogether.
Since this function is done for every block operation,
this streamlines the code and makes it a little bit more efficient.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Bob Peterson 2007-12-10 14:13:27 -06:00 committed by Steven Whitehouse
parent 2066b58b0a
commit e9e1ef2b6e
8 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/gfs2/bmap.c
View File

@ -452,8 +452,8 @@ static inline void bmap_unlock(struct inode *inode, int create)
* Returns: errno * Returns: errno
*/ */
int gfs2_block_map(struct inode *inode, u64 lblock, int create, int gfs2_block_map(struct inode *inode, sector_t lblock,
struct buffer_head *bh_map) struct buffer_head *bh_map, int create)
{ {
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_sbd *sdp = GFS2_SB(inode); struct gfs2_sbd *sdp = GFS2_SB(inode);
@ -559,7 +559,7 @@ int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsi
BUG_ON(!new); BUG_ON(!new);
bh.b_size = 1 << (inode->i_blkbits + 5); bh.b_size = 1 << (inode->i_blkbits + 5);
ret = gfs2_block_map(inode, lblock, create, &bh); ret = gfs2_block_map(inode, lblock, &bh, create);
*extlen = bh.b_size >> inode->i_blkbits; *extlen = bh.b_size >> inode->i_blkbits;
*dblock = bh.b_blocknr; *dblock = bh.b_blocknr;
if (buffer_new(&bh)) if (buffer_new(&bh))
@ -909,7 +909,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping)
err = 0; err = 0;
if (!buffer_mapped(bh)) { if (!buffer_mapped(bh)) {
gfs2_get_block(inode, iblock, bh, 0); gfs2_block_map(inode, iblock, bh, 0);
/* unmapped? It's a hole - nothing to do */ /* unmapped? It's a hole - nothing to do */
if (!buffer_mapped(bh)) if (!buffer_mapped(bh))
goto unlock; goto unlock;

2
fs/gfs2/bmap.h
View File

@ -15,7 +15,7 @@ struct gfs2_inode;
struct page; struct page;
int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page); int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page);
int gfs2_block_map(struct inode *inode, u64 lblock, int create, struct buffer_head *bh); int gfs2_block_map(struct inode *inode, sector_t lblock, struct buffer_head *bh, int create);
int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsigned *extlen); int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsigned *extlen);
int gfs2_truncatei(struct gfs2_inode *ip, u64 size); int gfs2_truncatei(struct gfs2_inode *ip, u64 size);

2
fs/gfs2/log.c
View File

@ -344,7 +344,7 @@ static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn)
struct buffer_head bh_map = { .b_state = 0, .b_blocknr = 0 }; struct buffer_head bh_map = { .b_state = 0, .b_blocknr = 0 };
bh_map.b_size = 1 << inode->i_blkbits; bh_map.b_size = 1 << inode->i_blkbits;
error = gfs2_block_map(inode, lbn, 0, &bh_map); error = gfs2_block_map(inode, lbn, &bh_map, 0);
if (error || !bh_map.b_blocknr) if (error || !bh_map.b_blocknr)
printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error,
(unsigned long long)bh_map.b_blocknr, lbn); (unsigned long long)bh_map.b_blocknr, lbn);

30
fs/gfs2/ops_address.c
View File

@ -58,22 +58,6 @@ static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page,
} }
} }
/**
* gfs2_get_block - Fills in a buffer head with details about a block
* @inode: The inode
* @lblock: The block number to look up
* @bh_result: The buffer head to return the result in
* @create: Non-zero if we may add block to the file
*
* Returns: errno
*/
int gfs2_get_block(struct inode *inode, sector_t lblock,
struct buffer_head *bh_result, int create)
{
return gfs2_block_map(inode, lblock, create, bh_result);
}
/** /**
* gfs2_get_block_noalloc - Fills in a buffer head with details about a block * gfs2_get_block_noalloc - Fills in a buffer head with details about a block
* @inode: The inode * @inode: The inode
@ -89,7 +73,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock,
{ {
int error; int error;
error = gfs2_block_map(inode, lblock, 0, bh_result); error = gfs2_block_map(inode, lblock, bh_result, 0);
if (error) if (error)
return error; return error;
if (!buffer_mapped(bh_result)) if (!buffer_mapped(bh_result))
@ -100,7 +84,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock,
static int gfs2_get_block_direct(struct inode *inode, sector_t lblock, static int gfs2_get_block_direct(struct inode *inode, sector_t lblock,
struct buffer_head *bh_result, int create) struct buffer_head *bh_result, int create)
{ {
return gfs2_block_map(inode, lblock, 0, bh_result); return gfs2_block_map(inode, lblock, bh_result, 0);
} }
/** /**
@ -504,7 +488,7 @@ static int __gfs2_readpage(void *file, struct page *page)
error = stuffed_readpage(ip, page); error = stuffed_readpage(ip, page);
unlock_page(page); unlock_page(page);
} else { } else {
error = mpage_readpage(page, gfs2_get_block); error = mpage_readpage(page, gfs2_block_map);
} }
if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
@ -598,7 +582,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state,
* Any I/O we ignore at this time will be done via readpage later. * Any I/O we ignore at this time will be done via readpage later.
* 2. We don't handle stuffed files here we let readpage do the honours. * 2. We don't handle stuffed files here we let readpage do the honours.
* 3. mpage_readpages() does most of the heavy lifting in the common case. * 3. mpage_readpages() does most of the heavy lifting in the common case.
* 4. gfs2_get_block() is relied upon to set BH_Boundary in the right places. * 4. gfs2_block_map() is relied upon to set BH_Boundary in the right places.
*/ */
static int gfs2_readpages(struct file *file, struct address_space *mapping, static int gfs2_readpages(struct file *file, struct address_space *mapping,
@ -615,7 +599,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping,
if (unlikely(ret)) if (unlikely(ret))
goto out_uninit; goto out_uninit;
if (!gfs2_is_stuffed(ip)) if (!gfs2_is_stuffed(ip))
ret = mpage_readpages(mapping, pages, nr_pages, gfs2_get_block); ret = mpage_readpages(mapping, pages, nr_pages, gfs2_block_map);
gfs2_glock_dq(&gh); gfs2_glock_dq(&gh);
out_uninit: out_uninit:
gfs2_holder_uninit(&gh); gfs2_holder_uninit(&gh);
@ -710,7 +694,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping,
} }
prepare_write: prepare_write:
error = block_prepare_write(page, from, to, gfs2_get_block); error = block_prepare_write(page, from, to, gfs2_block_map);
out: out:
if (error == 0) if (error == 0)
return 0; return 0;
@ -923,7 +907,7 @@ static sector_t gfs2_bmap(struct address_space *mapping, sector_t lblock)
return 0; return 0;
if (!gfs2_is_stuffed(ip)) if (!gfs2_is_stuffed(ip))
dblock = generic_block_bmap(mapping, lblock, gfs2_get_block); dblock = generic_block_bmap(mapping, lblock, gfs2_block_map);
gfs2_glock_dq_uninit(&i_gh); gfs2_glock_dq_uninit(&i_gh);

2
fs/gfs2/ops_address.h
View File

@ -14,8 +14,6 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/mm.h> #include <linux/mm.h>
extern int gfs2_get_block(struct inode *inode, sector_t lblock,
struct buffer_head *bh_result, int create);
extern int gfs2_releasepage(struct page *page, gfp_t gfp_mask); extern int gfs2_releasepage(struct page *page, gfp_t gfp_mask);
extern int gfs2_internal_read(struct gfs2_inode *ip, extern int gfs2_internal_read(struct gfs2_inode *ip,
struct file_ra_state *ra_state, struct file_ra_state *ra_state,

2
fs/gfs2/ops_file.c
View File

@ -323,7 +323,7 @@ static int gfs2_allocate_page_backing(struct page *page)
do { do {
bh.b_state = 0; bh.b_state = 0;
bh.b_size = size; bh.b_size = size;
gfs2_block_map(inode, lblock, 1, &bh); gfs2_block_map(inode, lblock, &bh, 1);
if (!buffer_mapped(&bh)) if (!buffer_mapped(&bh))
return -EIO; return -EIO;
size -= bh.b_size; size -= bh.b_size;

4
fs/gfs2/quota.c
View File

@ -276,7 +276,7 @@ static int bh_get(struct gfs2_quota_data *qd)
offset = qd->qd_slot % sdp->sd_qc_per_block;; offset = qd->qd_slot % sdp->sd_qc_per_block;;
bh_map.b_size = 1 << ip->i_inode.i_blkbits; bh_map.b_size = 1 << ip->i_inode.i_blkbits;
error = gfs2_block_map(&ip->i_inode, block, 0, &bh_map); error = gfs2_block_map(&ip->i_inode, block, &bh_map, 0);
if (error) if (error)
goto fail; goto fail;
error = gfs2_meta_read(ip->i_gl, bh_map.b_blocknr, DIO_WAIT, &bh); error = gfs2_meta_read(ip->i_gl, bh_map.b_blocknr, DIO_WAIT, &bh);
@ -645,7 +645,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
} }
if (!buffer_mapped(bh)) { if (!buffer_mapped(bh)) {
gfs2_get_block(inode, iblock, bh, 1); gfs2_block_map(inode, iblock, bh, 1);
if (!buffer_mapped(bh)) if (!buffer_mapped(bh))
goto unlock; goto unlock;
} }

2
fs/gfs2/recovery.c
View File

@ -391,7 +391,7 @@ static int clean_journal(struct gfs2_jdesc *jd, struct gfs2_log_header_host *hea
lblock = head->lh_blkno; lblock = head->lh_blkno;
gfs2_replay_incr_blk(sdp, &lblock); gfs2_replay_incr_blk(sdp, &lblock);
bh_map.b_size = 1 << ip->i_inode.i_blkbits; bh_map.b_size = 1 << ip->i_inode.i_blkbits;
error = gfs2_block_map(&ip->i_inode, lblock, 0, &bh_map); error = gfs2_block_map(&ip->i_inode, lblock, &bh_map, 0);
if (error) if (error)
return error; return error;
if (!bh_map.b_blocknr) { if (!bh_map.b_blocknr) {