2020-08-25 04:59:04

by Joe Perches

[permalink] [raw]
Subject: [PATCH 23/29] fuse: Avoid comma separated statements

Use semicolons and braces.

Signed-off-by: Joe Perches <[email protected]>
---
fs/fuse/dir.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 26f028bc760b..ecb6eed832a0 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1362,14 +1362,22 @@ static void iattr_to_fattr(struct fuse_conn *fc, struct iattr *iattr,
{
unsigned ivalid = iattr->ia_valid;

- if (ivalid & ATTR_MODE)
- arg->valid |= FATTR_MODE, arg->mode = iattr->ia_mode;
- if (ivalid & ATTR_UID)
- arg->valid |= FATTR_UID, arg->uid = from_kuid(fc->user_ns, iattr->ia_uid);
- if (ivalid & ATTR_GID)
- arg->valid |= FATTR_GID, arg->gid = from_kgid(fc->user_ns, iattr->ia_gid);
- if (ivalid & ATTR_SIZE)
- arg->valid |= FATTR_SIZE, arg->size = iattr->ia_size;
+ if (ivalid & ATTR_MODE) {
+ arg->valid |= FATTR_MODE;
+ arg->mode = iattr->ia_mode;
+ }
+ if (ivalid & ATTR_UID) {
+ arg->valid |= FATTR_UID;
+ arg->uid = from_kuid(fc->user_ns, iattr->ia_uid);
+ }
+ if (ivalid & ATTR_GID) {
+ arg->valid |= FATTR_GID;
+ arg->gid = from_kgid(fc->user_ns, iattr->ia_gid);
+ }
+ if (ivalid & ATTR_SIZE) {
+ arg->valid |= FATTR_SIZE;
+ arg->size = iattr->ia_size;
+ }
if (ivalid & ATTR_ATIME) {
arg->valid |= FATTR_ATIME;
arg->atime = iattr->ia_atime.tv_sec;
--
2.26.0


2021-01-30 19:06:17

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH 23/29] fuse: Avoid comma separated statements

On Mon, 2020-08-24 at 21:56 -0700, Joe Perches wrote:
> Use semicolons and braces.

ping?

> Signed-off-by: Joe Perches <[email protected]>
> ---
> ?fs/fuse/dir.c | 24 ++++++++++++++++--------
> ?1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
> index 26f028bc760b..ecb6eed832a0 100644
> --- a/fs/fuse/dir.c
> +++ b/fs/fuse/dir.c
> @@ -1362,14 +1362,22 @@ static void iattr_to_fattr(struct fuse_conn *fc, struct iattr *iattr,
> ?{
> ? unsigned ivalid = iattr->ia_valid;
> ?
>
> - if (ivalid & ATTR_MODE)
> - arg->valid |= FATTR_MODE, arg->mode = iattr->ia_mode;
> - if (ivalid & ATTR_UID)
> - arg->valid |= FATTR_UID, arg->uid = from_kuid(fc->user_ns, iattr->ia_uid);
> - if (ivalid & ATTR_GID)
> - arg->valid |= FATTR_GID, arg->gid = from_kgid(fc->user_ns, iattr->ia_gid);
> - if (ivalid & ATTR_SIZE)
> - arg->valid |= FATTR_SIZE, arg->size = iattr->ia_size;
> + if (ivalid & ATTR_MODE) {
> + arg->valid |= FATTR_MODE;
> + arg->mode = iattr->ia_mode;
> + }
> + if (ivalid & ATTR_UID) {
> + arg->valid |= FATTR_UID;
> + arg->uid = from_kuid(fc->user_ns, iattr->ia_uid);
> + }
> + if (ivalid & ATTR_GID) {
> + arg->valid |= FATTR_GID;
> + arg->gid = from_kgid(fc->user_ns, iattr->ia_gid);
> + }
> + if (ivalid & ATTR_SIZE) {
> + arg->valid |= FATTR_SIZE;
> + arg->size = iattr->ia_size;
> + }
> ? if (ivalid & ATTR_ATIME) {
> ? arg->valid |= FATTR_ATIME;
> ? arg->atime = iattr->ia_atime.tv_sec;


2021-02-01 08:17:19

by Miklos Szeredi

[permalink] [raw]
Subject: Re: [PATCH 23/29] fuse: Avoid comma separated statements

On Tue, Aug 25, 2020 at 6:57 AM Joe Perches <[email protected]> wrote:
>
> Use semicolons and braces.

Reference to coding style doc? Or other important reason? Or just
personal preference?

Thanks,
Miklos