summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse2006-01-30 10:39:10 +0100
committerSteven Whitehouse2006-01-30 10:39:10 +0100
commit4ff14670ee2a8229381ff295eaae84aa51beff43 (patch)
tree16d312eea37f3af8b04b43f9f5edd9bf550cf72a
parent[GFS2] Export file_read_actor (diff)
downloadkernel-qcow2-linux-4ff14670ee2a8229381ff295eaae84aa51beff43.tar.gz
kernel-qcow2-linux-4ff14670ee2a8229381ff295eaae84aa51beff43.tar.xz
kernel-qcow2-linux-4ff14670ee2a8229381ff295eaae84aa51beff43.zip
[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>
-rw-r--r--fs/gfs2/ops_address.c14
-rw-r--r--fs/gfs2/ops_address.h2
2 files changed, 9 insertions, 7 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index db66d3287550..a7fbfa0bbaf8 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -28,7 +28,7 @@
#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
* @lblock: The block number to look up
* @bh_result: The buffer head to return the result in
@@ -37,8 +37,8 @@
* Returns: errno
*/
-static int get_block(struct inode *inode, sector_t lblock,
- struct buffer_head *bh_result, int create)
+int gfs2_get_block(struct inode *inode, sector_t lblock,
+ struct buffer_head *bh_result, int create)
{
struct gfs2_inode *ip = get_v2ip(inode);
int new = create;
@@ -286,7 +286,7 @@ static int gfs2_readpage(struct file *file, struct page *page)
} else
error = zero_readpage(page);
} else
- error = block_read_full_page(page, get_block);
+ error = block_read_full_page(page, gfs2_get_block);
} else
error = jdata_readpage(ip, page);
@@ -328,11 +328,11 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
page);
if (!error)
error = block_prepare_write(page, from, to,
- get_block);
+ gfs2_get_block);
} else if (!PageUptodate(page))
error = stuffed_readpage(ip, page);
} else
- error = block_prepare_write(page, from, to, get_block);
+ error = block_prepare_write(page, from, to, gfs2_get_block);
return error;
}
@@ -420,7 +420,7 @@ static sector_t gfs2_bmap(struct address_space *mapping, sector_t lblock)
return 0;
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);
diff --git a/fs/gfs2/ops_address.h b/fs/gfs2/ops_address.h
index ced9ea0fdd31..f201a059fd91 100644
--- a/fs/gfs2/ops_address.h
+++ b/fs/gfs2/ops_address.h
@@ -11,5 +11,7 @@
#define __OPS_ADDRESS_DOT_H__
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__ */