diff options
Diffstat (limited to 'fs/gfs2/ops_address.c')
-rw-r--r-- | fs/gfs2/ops_address.c | 14 |
1 files changed, 7 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 @@ | |||
28 | #include "trans.h" | 28 | #include "trans.h" |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * get_block - Fills in a buffer head with details about a block | 31 | * gfs2_get_block - Fills in a buffer head with details about a block |
32 | * @inode: The inode | 32 | * @inode: The inode |
33 | * @lblock: The block number to look up | 33 | * @lblock: The block number to look up |
34 | * @bh_result: The buffer head to return the result in | 34 | * @bh_result: The buffer head to return the result in |
@@ -37,8 +37,8 @@ | |||
37 | * Returns: errno | 37 | * Returns: errno |
38 | */ | 38 | */ |
39 | 39 | ||
40 | static int get_block(struct inode *inode, sector_t lblock, | 40 | int gfs2_get_block(struct inode *inode, sector_t lblock, |
41 | struct buffer_head *bh_result, int create) | 41 | struct buffer_head *bh_result, int create) |
42 | { | 42 | { |
43 | struct gfs2_inode *ip = get_v2ip(inode); | 43 | struct gfs2_inode *ip = get_v2ip(inode); |
44 | int new = create; | 44 | int new = create; |
@@ -286,7 +286,7 @@ static int gfs2_readpage(struct file *file, struct page *page) | |||
286 | } else | 286 | } else |
287 | error = zero_readpage(page); | 287 | error = zero_readpage(page); |
288 | } else | 288 | } else |
289 | error = block_read_full_page(page, get_block); | 289 | error = block_read_full_page(page, gfs2_get_block); |
290 | } else | 290 | } else |
291 | error = jdata_readpage(ip, page); | 291 | error = jdata_readpage(ip, page); |
292 | 292 | ||
@@ -328,11 +328,11 @@ static int gfs2_prepare_write(struct file *file, struct page *page, | |||
328 | page); | 328 | page); |
329 | if (!error) | 329 | if (!error) |
330 | error = block_prepare_write(page, from, to, | 330 | error = block_prepare_write(page, from, to, |
331 | get_block); | 331 | gfs2_get_block); |
332 | } else if (!PageUptodate(page)) | 332 | } else if (!PageUptodate(page)) |
333 | error = stuffed_readpage(ip, page); | 333 | error = stuffed_readpage(ip, page); |
334 | } else | 334 | } else |
335 | error = block_prepare_write(page, from, to, get_block); | 335 | error = block_prepare_write(page, from, to, gfs2_get_block); |
336 | 336 | ||
337 | return error; | 337 | return error; |
338 | } | 338 | } |
@@ -420,7 +420,7 @@ static sector_t gfs2_bmap(struct address_space *mapping, sector_t lblock) | |||
420 | return 0; | 420 | return 0; |
421 | 421 | ||
422 | if (!gfs2_is_stuffed(ip)) | 422 | if (!gfs2_is_stuffed(ip)) |
423 | dblock = generic_block_bmap(mapping, lblock, get_block); | 423 | dblock = generic_block_bmap(mapping, lblock, gfs2_get_block); |
424 | 424 | ||
425 | gfs2_glock_dq_uninit(&i_gh); | 425 | gfs2_glock_dq_uninit(&i_gh); |
426 | 426 | ||