diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-15 09:38:15 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-15 09:38:15 +1000 |
| commit | ff14ee42a038cf48263ac8d2eca5d30196554b82 (patch) | |
| tree | cee5ba7a2b08d7e4f48d974d08ecfc40c8bd1308 /fs/xfs/xfs_ioctl32.c | |
| parent | b76769294ba400415fc44038c21cc2df86f9a28b (diff) | |
| parent | 8cfcc3e565bf15870efe801368a25ca98092e6e7 (diff) | |
| download | linux-ff14ee42a038cf48263ac8d2eca5d30196554b82.tar.gz linux-ff14ee42a038cf48263ac8d2eca5d30196554b82.tar.bz2 linux-ff14ee42a038cf48263ac8d2eca5d30196554b82.zip | |
Merge branch 'xfs-misc-fixes-1-for-3.16' into for-next
Diffstat (limited to 'fs/xfs/xfs_ioctl32.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c index a7992f8de9d3..944d5baa710a 100644 --- a/fs/xfs/xfs_ioctl32.c +++ b/fs/xfs/xfs_ioctl32.c @@ -424,10 +424,11 @@ xfs_compat_attrmulti_by_handle( ops = memdup_user(compat_ptr(am_hreq.ops), size); if (IS_ERR(ops)) { - error = PTR_ERR(ops); + error = -PTR_ERR(ops); goto out_dput; } + error = ENOMEM; attr_name = kmalloc(MAXNAMELEN, GFP_KERNEL); if (!attr_name) goto out_kfree_ops; @@ -438,7 +439,7 @@ xfs_compat_attrmulti_by_handle( compat_ptr(ops[i].am_attrname), MAXNAMELEN); if (ops[i].am_error == 0 || ops[i].am_error == MAXNAMELEN) - error = -ERANGE; + error = ERANGE; if (ops[i].am_error < 0) break; |