| Message ID | 20241030180140.3103156-1-colin.i.king@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [next] xattr: remove redundant check on variable err | expand |
On Wed, Oct 30, 2024 at 06:01:40PM +0000, Colin Ian King wrote: > 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. I'd suggest taking err itself into the loop body, while we are at it...
On Wed 30-10-24 18:01:40, Colin Ian King wrote: > 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. > > Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Yeah, makes sense. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/xattr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/xattr.c b/fs/xattr.c > index 05ec7e7d9e87..21beb82ab5dc 100644 > --- a/fs/xattr.c > +++ b/fs/xattr.c > @@ -1015,7 +1015,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); > > -- > 2.39.5 >
diff --git a/fs/xattr.c b/fs/xattr.c index 05ec7e7d9e87..21beb82ab5dc 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -1015,7 +1015,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);
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. Signed-off-by: Colin Ian King <colin.i.king@gmail.com> --- fs/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)