Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2641858pxa; Mon, 24 Aug 2020 21:59:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxODGUUNZ3ON5lm/QU/MIR6NDcYyKKCC26niHHQnHt7gMc0YTNYjn1A/67ZQ+w0TAi1uCaU X-Received: by 2002:a17:906:d206:: with SMTP id w6mr1252666ejz.428.1598331544566; Mon, 24 Aug 2020 21:59:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598331544; cv=none; d=google.com; s=arc-20160816; b=j2egI1P1/GPPTYzVZPsk0GBTI2eP76IYo/jz6uv1RrRq7f8OCHeHnYyjErL8SthMew rftAwWc3cEkGwFXQlKSeVOUSpJy6baI77TCA69d8eLCtUffxS4W8S0ZYJ4EKxFqCpSWv R/5Fh6b6lgEN13kLPkgQ0A088F1OCJRxqz+duO1yyZMeArnv362QKSuPphj53PvS8ko+ ZhiZU/FBAby/y0+8Eff54EoEt5zH8Zw0qH1iy3ZjOhTbO2xWMUPizwu4pDWByKAsyDwG DAG16h8m+yT8SxnTFHgk4kf/9roGGS4g8Ztbi5EVMaLVQjr1vWNb3845rdLP/9FTbRji NzIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xzHpeKKiX27ydlEDzR9l3pIm31QfhY5ra7QEq7Si6qo=; b=YWuIJNDVReqJnxjy+zKm3aO9HEaR+d4u63zDRoXHDOZ7wN/O16QD8NxzKoc8+SvEdD +6Ef2KnxSVLeL8f9NUbr1vnakSlGlO6U0uVg8QjBIdLwVsirGj71hzhuSUYeHpRmbJZL DNBQsAddYjeaEPe+++FRXe42qRM8f+4feiqlU+w+xeBWq41SP+EgN93i2c0XHm/8t4cc f8o05y9arO1iCifQrqMAyNo0FVJaI50Z9BxboMEN0S6csMZfq8SGTmpVG/SsEOBQaonm 2KE1u9oQqoV0/pzSjtQIO3ZqMHrBUqq+2cgmr8AFBtJ56RTjcjzI3hsZxHP0QU2dmmid Q9tA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n23si8153362ejj.194.2020.08.24.21.58.41; Mon, 24 Aug 2020 21:59:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728933AbgHYE5h (ORCPT + 99 others); Tue, 25 Aug 2020 00:57:37 -0400 Received: from smtprelay0023.hostedemail.com ([216.40.44.23]:33416 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728043AbgHYE50 (ORCPT ); Tue, 25 Aug 2020 00:57:26 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay07.hostedemail.com (Postfix) with ESMTP id 72EF6181D337B; Tue, 25 Aug 2020 04:57:25 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1515:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3352:3868:4321:5007:6261:8603:10004:10848:11026:11658:11914:12296:12297:12555:12895:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21627:30054,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:0,LUA_SUMMARY:none X-HE-Tag: bed18_451327127059 X-Filterd-Recvd-Size: 2137 Received: from joe-laptop.perches.com (unknown [47.151.133.149]) (Authenticated sender: joe@perches.com) by omf08.hostedemail.com (Postfix) with ESMTPA; Tue, 25 Aug 2020 04:57:24 +0000 (UTC) From: Joe Perches To: Jiri Kosina , Miklos Szeredi Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 23/29] fuse: Avoid comma separated statements Date: Mon, 24 Aug 2020 21:56:20 -0700 Message-Id: <1ccd477e845fe5a114960c6088612945e1a22f23.1598331149.git.joe@perches.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use semicolons and braces. Signed-off-by: Joe Perches --- 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