staging: erofs: simplify return value of `xattr_foreach'
As Dan Carpenter pointed out, there is no need to propagate positive return values back to its callers. Suggested-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com> Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
bdf30cef10
Коммит
6614f76530
|
@ -268,7 +268,7 @@ static int xattr_foreach(struct xattr_iter *it,
|
|||
out:
|
||||
/* xattrs should be 4-byte aligned (on-disk constraint) */
|
||||
it->ofs = EROFS_XATTR_ALIGN(it->ofs);
|
||||
return err;
|
||||
return err < 0 ? err : 0;
|
||||
}
|
||||
|
||||
struct getxattr_iter {
|
||||
|
@ -333,15 +333,12 @@ static int inline_getxattr(struct inode *inode, struct getxattr_iter *it)
|
|||
remaining = ret;
|
||||
while (remaining) {
|
||||
ret = xattr_foreach(&it->it, &find_xattr_handlers, &remaining);
|
||||
if (ret >= 0)
|
||||
break;
|
||||
|
||||
if (ret != -ENOATTR) /* -ENOMEM, -EIO, etc. */
|
||||
if (ret != -ENOATTR)
|
||||
break;
|
||||
}
|
||||
xattr_iter_end_final(&it->it);
|
||||
|
||||
return ret < 0 ? ret : it->buffer_size;
|
||||
return ret ? ret : it->buffer_size;
|
||||
}
|
||||
|
||||
static int shared_getxattr(struct inode *inode, struct getxattr_iter *it)
|
||||
|
@ -371,16 +368,13 @@ static int shared_getxattr(struct inode *inode, struct getxattr_iter *it)
|
|||
}
|
||||
|
||||
ret = xattr_foreach(&it->it, &find_xattr_handlers, NULL);
|
||||
if (ret >= 0)
|
||||
break;
|
||||
|
||||
if (ret != -ENOATTR) /* -ENOMEM, -EIO, etc. */
|
||||
if (ret != -ENOATTR)
|
||||
break;
|
||||
}
|
||||
if (vi->xattr_shared_count)
|
||||
xattr_iter_end_final(&it->it);
|
||||
|
||||
return ret < 0 ? ret : it->buffer_size;
|
||||
return ret ? ret : it->buffer_size;
|
||||
}
|
||||
|
||||
static bool erofs_xattr_user_list(struct dentry *dentry)
|
||||
|
@ -567,11 +561,11 @@ static int inline_listxattr(struct listxattr_iter *it)
|
|||
remaining = ret;
|
||||
while (remaining) {
|
||||
ret = xattr_foreach(&it->it, &list_xattr_handlers, &remaining);
|
||||
if (ret < 0)
|
||||
if (ret)
|
||||
break;
|
||||
}
|
||||
xattr_iter_end_final(&it->it);
|
||||
return ret < 0 ? ret : it->buffer_ofs;
|
||||
return ret ? ret : it->buffer_ofs;
|
||||
}
|
||||
|
||||
static int shared_listxattr(struct listxattr_iter *it)
|
||||
|
@ -601,13 +595,13 @@ static int shared_listxattr(struct listxattr_iter *it)
|
|||
}
|
||||
|
||||
ret = xattr_foreach(&it->it, &list_xattr_handlers, NULL);
|
||||
if (ret < 0)
|
||||
if (ret)
|
||||
break;
|
||||
}
|
||||
if (vi->xattr_shared_count)
|
||||
xattr_iter_end_final(&it->it);
|
||||
|
||||
return ret < 0 ? ret : it->buffer_ofs;
|
||||
return ret ? ret : it->buffer_ofs;
|
||||
}
|
||||
|
||||
ssize_t erofs_listxattr(struct dentry *dentry,
|
||||
|
|
Загрузка…
Ссылка в новой задаче