Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
fs
/
xfs
/
xfs_attr_list.c
diff --git
a/kernel/fs/xfs/xfs_attr_list.c
b/kernel/fs/xfs/xfs_attr_list.c
index
0ef7c2e
..
4fa1482
100644
(file)
--- a/
kernel/fs/xfs/xfs_attr_list.c
+++ b/
kernel/fs/xfs/xfs_attr_list.c
@@
-202,8
+202,10
@@
xfs_attr_shortform_list(xfs_attr_list_context_t *context)
sbp->namelen,
sbp->valuelen,
&sbp->name[sbp->namelen]);
sbp->namelen,
sbp->valuelen,
&sbp->name[sbp->namelen]);
- if (error)
+ if (error) {
+ kmem_free(sbuf);
return error;
return error;
+ }
if (context->seen_enough)
break;
cursor->offset++;
if (context->seen_enough)
break;
cursor->offset++;
@@
-454,14
+456,13
@@
xfs_attr3_leaf_list_int(
args.rmtblkcnt = xfs_attr3_rmt_blocks(
args.dp->i_mount, valuelen);
retval = xfs_attr_rmtval_get(&args);
args.rmtblkcnt = xfs_attr3_rmt_blocks(
args.dp->i_mount, valuelen);
retval = xfs_attr_rmtval_get(&args);
- if (retval)
- return retval;
- retval = context->put_listent(context,
- entry->flags,
- name_rmt->name,
- (int)name_rmt->namelen,
- valuelen,
- args.value);
+ if (!retval)
+ retval = context->put_listent(context,
+ entry->flags,
+ name_rmt->name,
+ (int)name_rmt->namelen,
+ valuelen,
+ args.value);
kmem_free(args.value);
} else {
retval = context->put_listent(context,
kmem_free(args.value);
} else {
retval = context->put_listent(context,