dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[GFS2] Rename get_block and make it extern 

This renames get_block to gfs2_get_block and makes it accessible
from outside ops_address.c.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Steven Whitehouse 2006-01-30 09:39:10 +00:00
parent c25ec8f568
commit 4ff14670ee
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/gfs2/ops_address.c
View File

@ -28,7 +28,7 @@
#include "trans.h" #include "trans.h"
/** /**
* get_block - Fills in a buffer head with details about a block * gfs2_get_block - Fills in a buffer head with details about a block
* @inode: The inode * @inode: The inode
* @lblock: The block number to look up * @lblock: The block number to look up
* @bh_result: The buffer head to return the result in * @bh_result: The buffer head to return the result in
@ -37,8 +37,8 @@
* Returns: errno * Returns: errno
*/ */
static int get_block(struct inode *inode, sector_t lblock, int gfs2_get_block(struct inode *inode, sector_t lblock,
struct buffer_head *bh_result, int create) struct buffer_head *bh_result, int create)
{ {
struct gfs2_inode *ip = get_v2ip(inode); struct gfs2_inode *ip = get_v2ip(inode);
int new = create; int new = create;
@ -286,7 +286,7 @@ static int gfs2_readpage(struct file *file, struct page *page)
} else } else
error = zero_readpage(page); error = zero_readpage(page);
} else } else
error = block_read_full_page(page, get_block); error = block_read_full_page(page, gfs2_get_block);
} else } else
error = jdata_readpage(ip, page); error = jdata_readpage(ip, page);
@ -328,11 +328,11 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
page); page);
if (!error) if (!error)
error = block_prepare_write(page, from, to, error = block_prepare_write(page, from, to,
get_block); gfs2_get_block);
} else if (!PageUptodate(page)) } else if (!PageUptodate(page))
error = stuffed_readpage(ip, page); error = stuffed_readpage(ip, page);
} else } else
error = block_prepare_write(page, from, to, get_block); error = block_prepare_write(page, from, to, gfs2_get_block);
return error; return error;
} }
@ -420,7 +420,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, get_block); dblock = generic_block_bmap(mapping, lblock, gfs2_get_block);
gfs2_glock_dq_uninit(&i_gh); gfs2_glock_dq_uninit(&i_gh);

2
fs/gfs2/ops_address.h
View File

@ -11,5 +11,7 @@
#define __OPS_ADDRESS_DOT_H__ #define __OPS_ADDRESS_DOT_H__
extern struct address_space_operations gfs2_file_aops; extern struct address_space_operations gfs2_file_aops;
extern int gfs2_get_block(struct inode *inode, sector_t lblock,
struct buffer_head *bh_result, int create);
#endif /* __OPS_ADDRESS_DOT_H__ */ #endif /* __OPS_ADDRESS_DOT_H__ */