lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy

Browse Source 
Pull jfs fix from Dave Kleikamp:
 "Bug fix: Fix FITRIM argument handling"

* tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy:
  jfs: Fix FITRIM argument handling
This commit is contained in:
Linus Torvalds
2012-10-23 08:49:34 +03:00
parent e589db7a6a 4e7a4b0122
commit d888af9654
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/jfs/jfs_discard.c
View File

@@ -83,7 +83,7 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
struct bmap *bmp = JFS_SBI(ip->i_sb)->bmap; struct bmap *bmp = JFS_SBI(ip->i_sb)->bmap;
struct super_block *sb = ipbmap->i_sb; struct super_block *sb = ipbmap->i_sb;
int agno, agno_end; int agno, agno_end;
s64 start, end, minlen; u64 start, end, minlen;
u64 trimmed = 0; u64 trimmed = 0;
/** /**
@@ -93,14 +93,18 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
* minlen: minimum extent length in Bytes * minlen: minimum extent length in Bytes
*/ */
start = range->start >> sb->s_blocksize_bits; start = range->start >> sb->s_blocksize_bits;
if (start < 0)
start = 0;
end = start + (range->len >> sb->s_blocksize_bits) - 1; end = start + (range->len >> sb->s_blocksize_bits) - 1;
minlen = range->minlen >> sb->s_blocksize_bits;
if (minlen == 0)
minlen = 1;
if (minlen > bmp->db_agsize ||
start >= bmp->db_mapsize ||
range->len < sb->s_blocksize)
return -EINVAL;
if (end >= bmp->db_mapsize) if (end >= bmp->db_mapsize)
end = bmp->db_mapsize - 1; end = bmp->db_mapsize - 1;
minlen = range->minlen >> sb->s_blocksize_bits;
if (minlen <= 0)
minlen = 1;
/** /**
* we trim all ag's within the range * we trim all ag's within the range