diff options
author | Jens Axboe <axboe@kernel.dk> | 2014-01-08 11:32:45 -0500 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2014-01-08 11:32:45 -0500 |
commit | 54a387cb9e600256e50cb9e2209e7e4f06f464de (patch) | |
tree | 37f2b32b1330f51dbe10ccf4300114c72f7aabdc /fs/btrfs/send.c | |
parent | 8586ea96b4f919a9b38929040bc9ce57c9998fc4 (diff) | |
parent | 0fec08b4ecfc36fd8a64432343b2964fb86d2675 (diff) |
Merge branch 'for-3.14/core' into for-3.14/drivers
We need the updated code to make bcache easier to merge.
Diffstat (limited to 'fs/btrfs/send.c')
-rw-r--r-- | fs/btrfs/send.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 6837fe87f3a6..945d1db98f26 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c | |||
@@ -4723,8 +4723,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) | |||
4723 | } | 4723 | } |
4724 | 4724 | ||
4725 | if (!access_ok(VERIFY_READ, arg->clone_sources, | 4725 | if (!access_ok(VERIFY_READ, arg->clone_sources, |
4726 | sizeof(*arg->clone_sources * | 4726 | sizeof(*arg->clone_sources) * |
4727 | arg->clone_sources_count))) { | 4727 | arg->clone_sources_count)) { |
4728 | ret = -EFAULT; | 4728 | ret = -EFAULT; |
4729 | goto out; | 4729 | goto out; |
4730 | } | 4730 | } |