asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Btrfs: return error when we specify wrong start to defrag

Browse source 
We need such a sanity check for wrong start when we defrag a file, otherwise,
even with a wrong start that's larger than file size, we can end up changing
not only inode's force compress flag but also FS's incompat flags.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
Liu Bo 2013-04-16 09:20:28 +00:00 committed by Josef Bacik
parent 3c59ccd32a
commit 0abd5b1724
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/btrfs/ioctl.c
View file

@ -1154,8 +1154,11 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
u64 new_align = ~((u64)128 * 1024 - 1); u64 new_align = ~((u64)128 * 1024 - 1);
struct page **pages = NULL; struct page **pages = NULL;
if (extent_thresh == 0) if (isize == 0)
extent_thresh = 256 * 1024; return 0;
if (range->start >= isize)
return -EINVAL;
if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS) { if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS) {
if (range->compress_type > BTRFS_COMPRESS_TYPES) if (range->compress_type > BTRFS_COMPRESS_TYPES)
@ -1164,8 +1167,8 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
compress_type = range->compress_type; compress_type = range->compress_type;
} }
if (isize == 0) if (extent_thresh == 0)
return 0; extent_thresh = 256 * 1024;
/* /*
* if we were not given a file, allocate a readahead * if we were not given a file, allocate a readahead