From patchwork Fri May 5 19:47:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98701 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292903qge; Fri, 5 May 2017 12:48:50 -0700 (PDT) X-Received: by 10.84.164.199 with SMTP id l7mr21152094plg.11.1494013730176; Fri, 05 May 2017 12:48:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.49; Fri, 05 May 2017 12:48:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755758AbdEETss (ORCPT + 6 others); Fri, 5 May 2017 15:48:48 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:49798 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755659AbdEETsg (ORCPT ); Fri, 5 May 2017 15:48:36 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MEwG2-1dIIk84ADC-00G4BT; Fri, 05 May 2017 21:48:31 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Dan Carpenter , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 67/87] Staging: lustre: missing curly braces in ll_setattr_raw() Date: Fri, 5 May 2017 21:47:25 +0200 Message-Id: <20170505194745.3627137-68-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:kpx+2oEr0xNiM2KVfZGd79kx9olpEnjPoL3HAxGvvBQoFMeHiER XErmd4U1mE21P9kcObe1lfhI8J7M/ANLmPDusJNqYUavjLEKfadLtgIoKFOi1Ll7wbLwJEw PHhNGr43FKVKblDrychOU8LoBYeWMr8rnfjPI8ekEPABxd1acNjDmrGs0u5Gz6N0rBmiznF 3fQRLgECcdTuu7Plu/o1g== X-UI-Out-Filterresults: notjunk:1; V01:K0:dlh1Irl/Z5Q=:qjKf8kq9nPgNs8tf2KbSXP +rWNOK5QJ6HJQEss7em4LM/AT9XFzUW2kp8aH+wV5bVQbWyVFpdwwZXslP5NYVPLDKNsY21Db wrnmYbQG6nqnkLud165IgRTArARGrq4v2/Mq2PQ3/u0mbfZNpwlQVaWTp4k8YYNFBiOGUmeLk fG1F70GBXNxvdwsw+arueZjn4wkZd3qgVttEyJRgbH3IYqekQvpIMrPut04hMFAQXQqi+RscU RBhXIzsVI+Ke0IHs40OnLG6QJhtblXtt8mc6nhYrSpObsACoEbvH9GqrZPx8TiN5g1XtmzQUe wC0VUVEgVO6GbJpSeSaRxXWicxbH1qafTgoUrxD+IosvJRBmwHBjhus1W1nwVcGCsn8siYPX/ smFkZEwf0V1SwU/h5K/MU+k22oj64y6WYo1fxEGH2qu4ub05kiqe42AkbCTBPv4qFyCmfre8N nKjLgmpP9ec+3LngAH6UUGgwDr/tgiMSBC8uoQfKJEsF7qx5wYoZK/giOQWe6js+0I8cd4xVY oxa5r8zoIaXcTASR2A8xmp3o9UF55pSZm54Ex+bwhVcfEEBAoKsGOj6KRMMVIH4UZA+JZRVCD Uvf73XumW5WUyBJLi803epSiMdFi4Qm/ZmjxYw4ThlfPthbWwNe66K6uafAbsXh5Rs7o5+dxH qRZY12cilJhz/Qk4QZiC6HZpSXjzMb0AzBAcM55OojUu5PiID81dHchtRjUohMWZ+JeM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter commit 53bd4a004ee5ff0f71a858de78faac98924b4a87 upstream. >From the indenting, it looks like curly braces were intended here. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/staging/lustre/lustre/llite/llite_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index 17cfa99b4fc0..764953089f64 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -1489,7 +1489,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) if (attr->ia_valid & (ATTR_SIZE | ATTR_ATIME | ATTR_ATIME_SET | - ATTR_MTIME | ATTR_MTIME_SET)) + ATTR_MTIME | ATTR_MTIME_SET)) { /* For truncate and utimes sending attributes to OSTs, setting * mtime/atime to the past will be performed under PW [0:EOF] * extent lock (new_size:EOF for truncate). It may seem @@ -1501,6 +1501,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) rc = ll_setattr_ost(inode, attr); if (attr->ia_valid & ATTR_SIZE) up_write(&lli->lli_trunc_sem); + } out: if (op_data) { if (op_data->op_ioepoch) {