diff options
Diffstat (limited to 'fs/gfs2/log.c')
-rw-r--r-- | fs/gfs2/log.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 50f88059c3d5..ab341cd0a76a 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
@@ -204,17 +204,15 @@ void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks) | |||
204 | 204 | ||
205 | static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn) | 205 | static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn) |
206 | { | 206 | { |
207 | int new = 0; | ||
208 | u64 dbn; | ||
209 | int error; | 207 | int error; |
210 | int bdy; | 208 | struct buffer_head bh_map; |
211 | 209 | ||
212 | error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, &new, &dbn, &bdy); | 210 | error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, 0, &bh_map, 1); |
213 | if (error || !dbn) | 211 | if (error || !bh_map.b_blocknr) |
214 | printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, (unsigned long long)dbn, lbn); | 212 | printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, bh_map.b_blocknr, lbn); |
215 | gfs2_assert_withdraw(sdp, !error && dbn); | 213 | gfs2_assert_withdraw(sdp, !error && bh_map.b_blocknr); |
216 | 214 | ||
217 | return dbn; | 215 | return bh_map.b_blocknr; |
218 | } | 216 | } |
219 | 217 | ||
220 | /** | 218 | /** |