diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /fs/xfs/xfs_xattr.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'fs/xfs/xfs_xattr.c')
| -rw-r--r-- | fs/xfs/xfs_xattr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c index 78ed92a46fdd..93455b998041 100644 --- a/fs/xfs/xfs_xattr.c +++ b/fs/xfs/xfs_xattr.c | |||
| @@ -49,7 +49,7 @@ xfs_xattr_get(struct dentry *dentry, const char *name, | |||
| 49 | value = NULL; | 49 | value = NULL; |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | error = -xfs_attr_get(ip, (unsigned char *)name, value, &asize, xflags); | 52 | error = xfs_attr_get(ip, (unsigned char *)name, value, &asize, xflags); |
| 53 | if (error) | 53 | if (error) |
| 54 | return error; | 54 | return error; |
| 55 | return asize; | 55 | return asize; |
| @@ -71,8 +71,8 @@ xfs_xattr_set(struct dentry *dentry, const char *name, const void *value, | |||
| 71 | xflags |= ATTR_REPLACE; | 71 | xflags |= ATTR_REPLACE; |
| 72 | 72 | ||
| 73 | if (!value) | 73 | if (!value) |
| 74 | return -xfs_attr_remove(ip, (unsigned char *)name, xflags); | 74 | return xfs_attr_remove(ip, (unsigned char *)name, xflags); |
| 75 | return -xfs_attr_set(ip, (unsigned char *)name, | 75 | return xfs_attr_set(ip, (unsigned char *)name, |
| 76 | (void *)value, size, xflags); | 76 | (void *)value, size, xflags); |
| 77 | } | 77 | } |
| 78 | 78 | ||