redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Christoph Hellwig <hch@lst.de>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
hifive-unleashed-5.1
Christoph Hellwig 2010-08-18 05:29:10 -04:00 committed by Jens Axboe
parent b372d360df
commit 2cf6d26a35
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ext4/mballoc.c
View File

@ -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); discard_block = block + ext4_group_first_block_no(sb, block_group);
trace_ext4_discard_blocks(sb, trace_ext4_discard_blocks(sb,
(unsigned long long) discard_block, count); (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) { if (ret == EOPNOTSUPP) {
ext4_warning(sb, "discard not supported, disabling"); ext4_warning(sb, "discard not supported, disabling");
clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD); clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD);

4
fs/fat/fatent.c
View File

@ -577,7 +577,9 @@ int fat_free_clusters(struct inode *inode, int cluster)
sb_issue_discard(sb, sb_issue_discard(sb,
fat_clus_to_blknr(sbi, first_cl), 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; first_cl = cluster;
} }

11
include/linux/blkdev.h
View File

@ -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); sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);
extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);
static inline int sb_issue_discard(struct super_block *sb, static inline int sb_issue_discard(struct super_block *sb, sector_t block,
sector_t block, sector_t nr_blocks) sector_t nr_blocks, gfp_t gfp_mask, unsigned long flags)
{ {
block <<= (sb->s_blocksize_bits - 9); return blkdev_issue_discard(sb->s_bdev, block << (sb->s_blocksize_bits - 9),
nr_blocks <<= (sb->s_blocksize_bits - 9); nr_blocks << (sb->s_blocksize_bits - 9),
return blkdev_issue_discard(sb->s_bdev, block, nr_blocks, GFP_NOFS, gfp_mask, flags);
BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
} }
extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm); extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm);