diff options
Diffstat (limited to 'fs/gfs2/unlinked.c')
| -rw-r--r-- | fs/gfs2/unlinked.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/gfs2/unlinked.c b/fs/gfs2/unlinked.c index 24b91c23bc2d..0d2314a5252c 100644 --- a/fs/gfs2/unlinked.c +++ b/fs/gfs2/unlinked.c | |||
| @@ -35,11 +35,12 @@ static int munge_ondisk(struct gfs2_sbd *sdp, unsigned int slot, | |||
| 35 | int new = 0; | 35 | int new = 0; |
| 36 | struct buffer_head *bh; | 36 | struct buffer_head *bh; |
| 37 | int error; | 37 | int error; |
| 38 | int boundary; | ||
| 38 | 39 | ||
| 39 | block = slot / sdp->sd_ut_per_block; | 40 | block = slot / sdp->sd_ut_per_block; |
| 40 | offset = slot % sdp->sd_ut_per_block; | 41 | offset = slot % sdp->sd_ut_per_block; |
| 41 | 42 | ||
| 42 | error = gfs2_block_map(ip, block, &new, &dblock, NULL); | 43 | error = gfs2_block_map(ip->i_vnode, block, &new, &dblock, &boundary); |
| 43 | if (error) | 44 | if (error) |
| 44 | return error; | 45 | return error; |
| 45 | error = gfs2_meta_read(ip->i_gl, dblock, DIO_START | DIO_WAIT, &bh); | 46 | error = gfs2_meta_read(ip->i_gl, dblock, DIO_START | DIO_WAIT, &bh); |
| @@ -354,7 +355,7 @@ int gfs2_unlinked_init(struct gfs2_sbd *sdp) | |||
| 354 | 355 | ||
| 355 | if (!extlen) { | 356 | if (!extlen) { |
| 356 | int new = 0; | 357 | int new = 0; |
| 357 | error = gfs2_block_map(ip, x, &new, &dblock, &extlen); | 358 | error = gfs2_extent_map(ip->i_vnode, x, &new, &dblock, &extlen); |
| 358 | if (error) | 359 | if (error) |
| 359 | goto fail; | 360 | goto fail; |
| 360 | } | 361 | } |
