xattr: remove redundant check on variable err
Subsystems (2)
PATCH v2 1/1 xattr: remove redundant check on variable err
Curretly in function generic_listxattr the for_each_xattr_handler loop checks err and will return out of the function if err is non-zero. It's impossible for err to be non-zero at the end of the function where err is checked again for a non-zero value. The final non-zero check is therefore redundant and can be removed. Also move the declaration of err into the loop.
---
V2: Move declaration of err into the loop as per Al Viro's suggestion
--- fs/xattr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xattr.c +3 -2
@@ -1005,9 +1005,10 @@ generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) {const struct xattr_handler *handler, *const *handlers = dentry->d_sb->s_xattr;ssize_t remaining_size = buffer_size; -int err =0 ;for_each_xattr_handler (handlers, handler) { +int err; +if (!handler->name || (handler->list && !handler->list (dentry)))continue ; err =xattr_list_one (&buffer, &remaining_size, handler->name);
@@ -1015,7 +1016,7 @@ generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)return err; } -return err ? err : buffer_size - remaining_size; +return buffer_size - remaining_size; }EXPORT_SYMBOL (generic_listxattr);
Signature · 1 line
2.39.5
Al Viro
maintainerQuoted 8 lines · Colin Ian King
Curretly in function
generic_listxattrthefor_each_xattr_handlerloop checks err and will return out of the function if err is non-zero. It's impossible for err to be non-zero at the end of the function where err is checked again for a non-zero value. The final non-zero check is therefore redundant and can be removed. Also move the declaration of err into the loop.Signed-off-by Colin Ian King <[email protected]>
Applied (viro/vfs.git #work.xattr2)