diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-05-25 09:17:40 +0530 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-05-25 09:17:40 +0530 |
| commit | ad5ca4cbf2df1d5e30269097e57ddbf13d8c189d (patch) | |
| tree | f2f678167dc46250662896c90ac36ee8015e2438 /fs | |
| parent | 869cf3be9976f56aa25ad7176f32c0acef3c605f (diff) | |
| parent | f9429439e89dd9e7440de0334f3eefcd3a37adf4 (diff) | |
| download | kernel_samsung_aries-ad5ca4cbf2df1d5e30269097e57ddbf13d8c189d.zip kernel_samsung_aries-ad5ca4cbf2df1d5e30269097e57ddbf13d8c189d.tar.gz kernel_samsung_aries-ad5ca4cbf2df1d5e30269097e57ddbf13d8c189d.tar.bz2 | |
Merge tag 'v3.0.80' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
This is the 3.0.80 stable release
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ioctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index a3c4751..a205027 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1539,7 +1539,11 @@ static noinline int copy_to_sk(struct btrfs_root *root, item_off = btrfs_item_ptr_offset(leaf, i); item_len = btrfs_item_size_nr(leaf, i); - if (item_len > BTRFS_SEARCH_ARGS_BUFSIZE) + btrfs_item_key_to_cpu(leaf, key, i); + if (!key_in_sk(key, sk)) + continue; + + if (sizeof(sh) + item_len > BTRFS_SEARCH_ARGS_BUFSIZE) item_len = 0; if (sizeof(sh) + item_len + *sk_offset > @@ -1548,10 +1552,6 @@ static noinline int copy_to_sk(struct btrfs_root *root, goto overflow; } - btrfs_item_key_to_cpu(leaf, key, i); - if (!key_in_sk(key, sk)) - continue; - sh.objectid = key->objectid; sh.offset = key->offset; sh.type = key->type; |