From patchwork Wed Jul 12 09:54:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ernesto_A=2E_Fern=C3=A1ndez?= X-Patchwork-Id: 787114 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x6vSf31mHz9s65 for ; Wed, 12 Jul 2017 19:54:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Xagca2d2"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756092AbdGLJy4 (ORCPT ); Wed, 12 Jul 2017 05:54:56 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:35073 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751246AbdGLJyz (ORCPT ); Wed, 12 Jul 2017 05:54:55 -0400 Received: by mail-qk0-f193.google.com with SMTP id 16so2421443qkg.2; Wed, 12 Jul 2017 02:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=vF4lzHWjvr7V17HPMFM4cSs3AFItvm6XCN5LtrbMHpA=; b=Xagca2d2zoKhzs+4V485h2XWpA87LcT2IDUSHVv/d3oqazokPZ/v9ET3Lj6+u2/ctr V7NwVB9qzWuqAd+n3HeeAD8BURkPuzQ+qkdUpqiYiGQei4/bTV3uUqZjZLF6HYBChqHB l9ahOoKAXuWRI8IYkYwh1C4YJymu9yrDVbl5RBZtOv0JEiUVJVMgX9TI+7zL3EZGkErw TVSrPeg0QU4VF6dOJ9Hy+AjPqp5V9FxgNAcvP9gHrH+Xu3OADsLemRwXWfowC9vJ4WCr EdOKjtlc7E64WXccsGqyFgOFnPCbl8Z6/2VsRIaUYpwDFoUub3JvZDYCbzFA7snMuv56 nx8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=vF4lzHWjvr7V17HPMFM4cSs3AFItvm6XCN5LtrbMHpA=; b=KLbrc3GwDgAuJ85ZPkvjtIdK2qEbbF/qLdbEi+wHZWP+gsJtPuOxmpZJTcweSrQG/4 /ktxoAiobYtL6G8AdYUpyZQCSmdaKkQl0Od68cywVOX+7pINfURE4idqC01Ua3FoPL8i DmXgnY+WT424fbwj7mI2ch269V8sve2jKHZ5jakCxhyip3JBApaUQ+m1MeyWtbr96nCg 3wMwy4o23hi4pxLudA7Y3nXnUt5XWGsC3AMFquPE0JcBK0CanMOBKLX2CufpqEvyAlXC qkr3gDpiUDykeY97daVIpcp8UTvUf7WYb51rXr24j0rRTJtYW+XXPwcBrrESz6nYrpnt hxmw== X-Gm-Message-State: AIVw112pLPNu7Oq+GrrHY+hPnEIEEanJyKP0ELGW/Cf1pziEp9gvv3I0 ruJ9aZsHILbDFg== X-Received: by 10.237.34.109 with SMTP id o42mr5462539qtc.217.1499853294984; Wed, 12 Jul 2017 02:54:54 -0700 (PDT) Received: from debian.home ([186.18.119.100]) by smtp.gmail.com with ESMTPSA id w43sm1512183qtc.48.2017.07.12.02.54.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jul 2017 02:54:54 -0700 (PDT) Date: Wed, 12 Jul 2017 06:54:50 -0300 From: Ernesto =?utf-8?Q?A=2E_Fern=C3=A1ndez?= To: Jan Kara , Theodore Ts'o , Andreas Dilger , Dave Kleikamp , linux-ext4@vger.kernel.org, jfs-discussion@lists.sourceforge.net, reiserfs-devel@vger.kernel.org Subject: [PATCH 3/5] ext2: fix line over 80 characters in ext2_set_acl() Message-ID: <8c89043c298756b37fa74403b8b9d12fac9f8783.1499805487.git.ernesto.mnd.fernandez@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Shorten the name of the error variable to 'err' so the call to posix_acl_update_mode() fits within 80 characters. Signed-off-by: Ernesto A. Fernández --- fs/ext2/acl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 4e04b7e..d2cca5c 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c @@ -184,7 +184,7 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type) int name_index; void *value = NULL; size_t size = 0; - int error; + int err; int update_mode = 0; umode_t mode = inode->i_mode; @@ -192,9 +192,9 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type) case ACL_TYPE_ACCESS: name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS; if (acl) { - error = posix_acl_update_mode(inode, &mode, &acl); - if (error) - return error; + err = posix_acl_update_mode(inode, &mode, &acl); + if (err) + return err; update_mode = 1; } break; @@ -214,10 +214,10 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type) return (int)PTR_ERR(value); } - error = ext2_xattr_set(inode, name_index, "", value, size, 0); + err = ext2_xattr_set(inode, name_index, "", value, size, 0); kfree(value); - if (!error) { + if (!err) { set_cached_acl(inode, type, acl); if (update_mode) { inode->i_mode = mode; @@ -225,7 +225,7 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type) mark_inode_dirty(inode); } } - return error; + return err; } /*