log.c (a5344a9555fffd045218aced89afd6ca0f884e10) | log.c (23591256d61354e20f12e98d7a496ad5c23de74c) |
---|---|
1/* 2 * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. 3 * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. 4 * 5 * This copyrighted material is made available to anyone wishing to use, 6 * modify, copy, or redistribute it subject to the terms and conditions 7 * of the GNU General Public License version 2. 8 */ --- 298 unchanged lines hidden (view full) --- 307 gfs2_assert_withdraw(sdp, 308 sdp->sd_log_blks_free <= sdp->sd_jdesc->jd_blocks); 309 gfs2_log_unlock(sdp); 310 up_read(&sdp->sd_log_flush_lock); 311} 312 313static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn) 314{ | 1/* 2 * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. 3 * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. 4 * 5 * This copyrighted material is made available to anyone wishing to use, 6 * modify, copy, or redistribute it subject to the terms and conditions 7 * of the GNU General Public License version 2. 8 */ --- 298 unchanged lines hidden (view full) --- 307 gfs2_assert_withdraw(sdp, 308 sdp->sd_log_blks_free <= sdp->sd_jdesc->jd_blocks); 309 gfs2_log_unlock(sdp); 310 up_read(&sdp->sd_log_flush_lock); 311} 312 313static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn) 314{ |
315 struct inode *inode = sdp->sd_jdesc->jd_inode; |
|
315 int error; | 316 int error; |
316 struct buffer_head bh_map; | 317 struct buffer_head bh_map = { .b_state = 0, .b_blocknr = 0 }; |
317 | 318 |
318 error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, 0, &bh_map, 1); | 319 bh_map.b_size = 1 << inode->i_blkbits; 320 error = gfs2_block_map(inode, lbn, 0, &bh_map); |
319 if (error || !bh_map.b_blocknr) 320 printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, bh_map.b_blocknr, lbn); 321 gfs2_assert_withdraw(sdp, !error && bh_map.b_blocknr); 322 323 return bh_map.b_blocknr; 324} 325 326/** --- 360 unchanged lines hidden --- | 321 if (error || !bh_map.b_blocknr) 322 printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, bh_map.b_blocknr, lbn); 323 gfs2_assert_withdraw(sdp, !error && bh_map.b_blocknr); 324 325 return bh_map.b_blocknr; 326} 327 328/** --- 360 unchanged lines hidden --- |