diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-05-29 19:37:13 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2013-05-29 19:37:13 -0400 |
commit | 74d8a3023d304977150828a325fa898121f64d41 (patch) | |
tree | c3ab48cde85e55999d83eda6b8854286d4fa1a7d /fs/btrfs | |
parent | ad6b260c31bdbfff9fd3691163a63b32a7420a12 (diff) | |
parent | f9429439e89dd9e7440de0334f3eefcd3a37adf4 (diff) |
Merge tag 'v3.0.80' into v3.0-rt
This is the 3.0.80 stable release
Diffstat (limited to 'fs/btrfs')
-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 a3c4751e07db..a205027ce50d 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; |