diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-06-08 20:14:49 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-08 20:14:49 +0300 |
| commit | 4263eb6880df8383fff0efb872278a99eb6142c8 (patch) | |
| tree | 67ab9bf228e4f5f341f9408e055180932b39fe06 /fs/xattr.c | |
| parent | 636338d7968e47c7f2e0b772a2a825ad932883fb (diff) | |
| parent | 8e326a8bdef3fb42b92bf2742e8405d9b9209367 (diff) | |
| download | linux-4263eb6880df8383fff0efb872278a99eb6142c8.tar.xz | |
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'fs/xattr.c')
| -rw-r--r-- | fs/xattr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xattr.c b/fs/xattr.c index e13265e65871..91608d9bfc6a 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -876,6 +876,9 @@ int simple_xattr_set(struct simple_xattrs *xattrs, const char *name, struct simple_xattr *new_xattr = NULL; int err = 0; + if (removed_size) + *removed_size = -1; + /* value == NULL means remove */ if (value) { new_xattr = simple_xattr_alloc(value, size); @@ -914,9 +917,6 @@ int simple_xattr_set(struct simple_xattrs *xattrs, const char *name, list_add(&new_xattr->list, &xattrs->head); xattr = NULL; } - - if (removed_size) - *removed_size = -1; out: spin_unlock(&xattrs->lock); if (xattr) { |