diff options
Diffstat (limited to 'fs/gfs2/bmap.c')
-rw-r--r-- | fs/gfs2/bmap.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index ce4a978e0c18..685c305cbeb6 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c | |||
@@ -491,14 +491,12 @@ static int gfs2_iomap_alloc(struct inode *inode, struct iomap *iomap, | |||
491 | { | 491 | { |
492 | struct gfs2_inode *ip = GFS2_I(inode); | 492 | struct gfs2_inode *ip = GFS2_I(inode); |
493 | struct gfs2_sbd *sdp = GFS2_SB(inode); | 493 | struct gfs2_sbd *sdp = GFS2_SB(inode); |
494 | struct super_block *sb = sdp->sd_vfs; | ||
495 | struct buffer_head *dibh = mp->mp_bh[0]; | 494 | struct buffer_head *dibh = mp->mp_bh[0]; |
496 | u64 bn; | 495 | u64 bn; |
497 | unsigned n, i, blks, alloced = 0, iblks = 0, branch_start = 0; | 496 | unsigned n, i, blks, alloced = 0, iblks = 0, branch_start = 0; |
498 | unsigned dblks = 0; | 497 | unsigned dblks = 0; |
499 | unsigned ptrs_per_blk; | 498 | unsigned ptrs_per_blk; |
500 | const unsigned end_of_metadata = mp->mp_fheight - 1; | 499 | const unsigned end_of_metadata = mp->mp_fheight - 1; |
501 | int ret; | ||
502 | enum alloc_state state; | 500 | enum alloc_state state; |
503 | __be64 *ptr; | 501 | __be64 *ptr; |
504 | __be64 zero_bn = 0; | 502 | __be64 zero_bn = 0; |
@@ -607,15 +605,6 @@ static int gfs2_iomap_alloc(struct inode *inode, struct iomap *iomap, | |||
607 | iomap->flags |= IOMAP_F_NEW; | 605 | iomap->flags |= IOMAP_F_NEW; |
608 | while (n-- > 0) | 606 | while (n-- > 0) |
609 | *ptr++ = cpu_to_be64(bn++); | 607 | *ptr++ = cpu_to_be64(bn++); |
610 | if (flags & IOMAP_ZERO) { | ||
611 | ret = sb_issue_zeroout(sb, iomap->addr >> inode->i_blkbits, | ||
612 | dblks, GFP_NOFS); | ||
613 | if (ret) { | ||
614 | fs_err(sdp, | ||
615 | "Failed to zero data buffers\n"); | ||
616 | flags &= ~IOMAP_ZERO; | ||
617 | } | ||
618 | } | ||
619 | break; | 608 | break; |
620 | } | 609 | } |
621 | } while (iomap->addr == IOMAP_NULL_ADDR); | 610 | } while (iomap->addr == IOMAP_NULL_ADDR); |
@@ -846,8 +835,6 @@ int gfs2_block_map(struct inode *inode, sector_t lblock, | |||
846 | 835 | ||
847 | if (create) | 836 | if (create) |
848 | flags |= IOMAP_WRITE; | 837 | flags |= IOMAP_WRITE; |
849 | if (buffer_zeronew(bh_map)) | ||
850 | flags |= IOMAP_ZERO; | ||
851 | ret = gfs2_iomap_begin(inode, (loff_t)lblock << inode->i_blkbits, | 838 | ret = gfs2_iomap_begin(inode, (loff_t)lblock << inode->i_blkbits, |
852 | bh_map->b_size, flags, &iomap); | 839 | bh_map->b_size, flags, &iomap); |
853 | if (ret) { | 840 | if (ret) { |