GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-19 21:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into upstream-merge

Browse source 
Conflicts:
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	include/trace/events/ext4.h
This commit is contained in:
Theodore Ts'o 2010-10-27 23:44:47 -04:00
commit a107e5a3a4
33 changed files with 2513 additions and 1134 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/linux/blkdev.h
View file

@ -891,6 +891,14 @@ static inline int sb_issue_discard(struct super_block *sb, sector_t block,
nr_blocks << (sb->s_blocksize_bits - 9),
gfp_mask, flags);
}
static inline int sb_issue_zeroout(struct super_block *sb, sector_t block,
sector_t nr_blocks, gfp_t gfp_mask)
{
return blkdev_issue_zeroout(sb->s_bdev,
block << (sb->s_blocksize_bits - 9),
nr_blocks << (sb->s_blocksize_bits - 9),
gfp_mask);
}
extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm);