aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/erofs
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/erofs')
-rw-r--r--drivers/staging/erofs/unzip_vle.c3
-rw-r--r--drivers/staging/erofs/xattr.c16
2 files changed, 10 insertions, 9 deletions
diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c
index 1030ca5c2dc3..45b1255f5a22 100644
--- a/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@ -702,7 +702,8 @@ next_part:
/* can be used for verification */
map->m_llen = offset + cur - map->m_la;
- if ((end = cur) > 0)
+ end = cur;
+ if (end > 0)
goto repeat;
/* FIXME! avoid the last relundant fixup & endio */
diff --git a/drivers/staging/erofs/xattr.c b/drivers/staging/erofs/xattr.c
index 6b9685fa601c..0e9cfeccdf99 100644
--- a/drivers/staging/erofs/xattr.c
+++ b/drivers/staging/erofs/xattr.c
@@ -288,8 +288,8 @@ static int inline_getxattr(struct inode *inode, struct getxattr_iter *it)
remaining = ret;
while (remaining) {
- if ((ret = xattr_foreach(&it->it,
- &find_xattr_handlers, &remaining)) >= 0)
+ ret = xattr_foreach(&it->it, &find_xattr_handlers, &remaining);
+ if (ret >= 0)
break;
}
xattr_iter_end(&it->it, true);
@@ -321,8 +321,8 @@ static int shared_getxattr(struct inode *inode, struct getxattr_iter *it)
it->it.blkaddr = blkaddr;
}
- if ((ret = xattr_foreach(&it->it,
- &find_xattr_handlers, NULL)) >= 0)
+ ret = xattr_foreach(&it->it, &find_xattr_handlers, NULL);
+ if (ret >= 0)
break;
}
if (vi->xattr_shared_count)
@@ -512,8 +512,8 @@ static int inline_listxattr(struct listxattr_iter *it)
remaining = ret;
while (remaining) {
- if ((ret = xattr_foreach(&it->it,
- &list_xattr_handlers, &remaining)) < 0)
+ ret = xattr_foreach(&it->it, &list_xattr_handlers, &remaining);
+ if (ret < 0)
break;
}
xattr_iter_end(&it->it, true);
@@ -544,8 +544,8 @@ static int shared_listxattr(struct listxattr_iter *it)
it->it.blkaddr = blkaddr;
}
- if ((ret = xattr_foreach(&it->it,
- &list_xattr_handlers, NULL)) < 0)
+ ret = xattr_foreach(&it->it, &list_xattr_handlers, NULL);
+ if (ret < 0)
break;
}
if (vi->xattr_shared_count)