Loading fs/gfs2/incore.h +0 −3 Original line number Diff line number Diff line Loading @@ -12,9 +12,6 @@ #include <linux/fs.h> #define DIO_FORCE 0x00000001 #define DIO_CLEAN 0x00000002 #define DIO_DIRTY 0x00000004 #define DIO_START 0x00000008 #define DIO_WAIT 0x00000010 #define DIO_METADATA 0x00000020 Loading fs/gfs2/meta_io.c +1 −5 Original line number Diff line number Diff line Loading @@ -120,8 +120,7 @@ void gfs2_ail1_start_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai) gfs2_io_error_bh(sdp, bh); gfs2_log_lock(sdp); } list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list); list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list); continue; } Loading Loading @@ -411,9 +410,6 @@ int gfs2_meta_reread(struct gfs2_sbd *sdp, struct buffer_head *bh, int flags) if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) return -EIO; if (flags & DIO_FORCE) clear_buffer_uptodate(bh); if ((flags & DIO_START) && !buffer_uptodate(bh)) ll_rw_block(READ, 1, &bh); Loading fs/gfs2/ops_address.c +2 −2 Original line number Diff line number Diff line Loading @@ -65,7 +65,7 @@ static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page, int gfs2_get_block(struct inode *inode, sector_t lblock, struct buffer_head *bh_result, int create) { return gfs2_block_map(inode, lblock, create, bh_result, 32); return gfs2_block_map(inode, lblock, create, bh_result, 4); } /** Loading Loading @@ -94,7 +94,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock, static int gfs2_get_block_direct(struct inode *inode, sector_t lblock, struct buffer_head *bh_result, int create) { return gfs2_block_map(inode, lblock, 0, bh_result, 512); return gfs2_block_map(inode, lblock, 0, bh_result, 32); } /** Loading Loading
fs/gfs2/incore.h +0 −3 Original line number Diff line number Diff line Loading @@ -12,9 +12,6 @@ #include <linux/fs.h> #define DIO_FORCE 0x00000001 #define DIO_CLEAN 0x00000002 #define DIO_DIRTY 0x00000004 #define DIO_START 0x00000008 #define DIO_WAIT 0x00000010 #define DIO_METADATA 0x00000020 Loading
fs/gfs2/meta_io.c +1 −5 Original line number Diff line number Diff line Loading @@ -120,8 +120,7 @@ void gfs2_ail1_start_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai) gfs2_io_error_bh(sdp, bh); gfs2_log_lock(sdp); } list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list); list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list); continue; } Loading Loading @@ -411,9 +410,6 @@ int gfs2_meta_reread(struct gfs2_sbd *sdp, struct buffer_head *bh, int flags) if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) return -EIO; if (flags & DIO_FORCE) clear_buffer_uptodate(bh); if ((flags & DIO_START) && !buffer_uptodate(bh)) ll_rw_block(READ, 1, &bh); Loading
fs/gfs2/ops_address.c +2 −2 Original line number Diff line number Diff line Loading @@ -65,7 +65,7 @@ static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page, int gfs2_get_block(struct inode *inode, sector_t lblock, struct buffer_head *bh_result, int create) { return gfs2_block_map(inode, lblock, create, bh_result, 32); return gfs2_block_map(inode, lblock, create, bh_result, 4); } /** Loading Loading @@ -94,7 +94,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock, static int gfs2_get_block_direct(struct inode *inode, sector_t lblock, struct buffer_head *bh_result, int create) { return gfs2_block_map(inode, lblock, 0, bh_result, 512); return gfs2_block_map(inode, lblock, 0, bh_result, 32); } /** Loading