Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf6d26a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: pass gfp_mask and flags to sb_issue_discard 



We'll need to get rid of the BLKDEV_IFL_BARRIER flag, and to facilitate
that and to make the interface less confusing pass all flags explicitly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent b372d360

fs/ext4/mballoc.c

+2 −1
Original line number Diff line number Diff line
@@ -2566,7 +2566,8 @@ static inline void ext4_issue_discard(struct super_block *sb, 
	discard_block = block + ext4_group_first_block_no(sb, block_group);

	trace_ext4_discard_blocks(sb,

			(unsigned long long) discard_block, count);

	ret = sb_issue_discard(sb, discard_block, count);

	ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS,

			       BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);

	if (ret == EOPNOTSUPP) {

		ext4_warning(sb, "discard not supported, disabling");

		clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD);

fs/fat/fatent.c

+3 −1
Original line number Diff line number Diff line
@@ -577,7 +577,9 @@ int fat_free_clusters(struct inode *inode, int cluster) 


				sb_issue_discard(sb,

					fat_clus_to_blknr(sbi, first_cl),

					nr_clus * sbi->sec_per_clus);

					nr_clus * sbi->sec_per_clus,

					GFP_NOFS,

					BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);



				first_cl = cluster;

			}

include/linux/blkdev.h

+5 −6
Original line number Diff line number Diff line
@@ -881,13 +881,12 @@ extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
		sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);

extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,

			sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);

static inline int sb_issue_discard(struct super_block *sb,

				   sector_t block, sector_t nr_blocks)

static inline int sb_issue_discard(struct super_block *sb, sector_t block,

		sector_t nr_blocks, gfp_t gfp_mask, unsigned long flags)

{

	block <<= (sb->s_blocksize_bits - 9);

	nr_blocks <<= (sb->s_blocksize_bits - 9);

	return blkdev_issue_discard(sb->s_bdev, block, nr_blocks, GFP_NOFS,

				   BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);

	return blkdev_issue_discard(sb->s_bdev, block << (sb->s_blocksize_bits - 9),

				    nr_blocks << (sb->s_blocksize_bits - 9),

				    gfp_mask, flags);

}



extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm);