aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank A. Cancio Bello <frank@generalsoftwareinc.com>2019-11-02 04:06:54 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-03 13:10:10 +0100
commitd3baf1e0b2fefa9433e8d299541cf451e59c5709 (patch)
tree373693f1db8698e7d2c19ac8c2f7a4bacb01cdfe
parentstaging: exfat: Fix parameter alignment issues (diff)
downloadlinux-dev-d3baf1e0b2fefa9433e8d299541cf451e59c5709.tar.xz
linux-dev-d3baf1e0b2fefa9433e8d299541cf451e59c5709.zip
staging: exfat: Fix logical operation continuation
Operators inside a multiline logical expression should be at the end of the line not at the beginning. This patch fixes two of those cases and remove an unnecessary parenthesis too, to comply in that way with the preferred coding style for the linux kernel. Suggested-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Frank A. Cancio Bello <frank@generalsoftwareinc.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Link: https://lore.kernel.org/r/ace2cbd5e4c03751fb522e7bbd60149e7ed969ae.1572666556.git.frank@generalsoftwareinc.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/exfat/exfat_super.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
index 77984a73ba6e..5f972588669c 100644
--- a/drivers/staging/exfat/exfat_super.c
+++ b/drivers/staging/exfat/exfat_super.c
@@ -2980,8 +2980,8 @@ static int exfat_setattr(struct dentry *dentry, struct iattr *attr)
pr_debug("%s entered\n", __func__);
- if ((attr->ia_valid & ATTR_SIZE)
- && (attr->ia_size > i_size_read(inode))) {
+ if ((attr->ia_valid & ATTR_SIZE) &&
+ attr->ia_size > i_size_read(inode)) {
error = exfat_cont_expand(inode, attr->ia_size);
if (error || attr->ia_valid == ATTR_SIZE)
return error;
@@ -2990,8 +2990,8 @@ static int exfat_setattr(struct dentry *dentry, struct iattr *attr)
ia_valid = attr->ia_valid;
- if ((ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET))
- && exfat_allow_set_time(sbi, inode)) {
+ if ((ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)) &&
+ exfat_allow_set_time(sbi, inode)) {
attr->ia_valid &= ~(ATTR_MTIME_SET |
ATTR_ATIME_SET |
ATTR_TIMES_SET);