From patchwork Sat Jun 23 06:38:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10483481 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 167CE60532 for ; Sat, 23 Jun 2018 06:40:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0DCE28FBE for ; Sat, 23 Jun 2018 06:40:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC8A128FD4; Sat, 23 Jun 2018 06:40:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55F4A28FBE for ; Sat, 23 Jun 2018 06:40:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751445AbeFWGkE (ORCPT ); Sat, 23 Jun 2018 02:40:04 -0400 Received: from mout.gmx.net ([212.227.17.20]:58459 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751438AbeFWGkD (ORCPT ); Sat, 23 Jun 2018 02:40:03 -0400 Received: from localhost.localdomain ([122.224.77.194]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0M3u86-1gNkpU37mU-00rbuW; Sat, 23 Jun 2018 08:39:56 +0200 From: Chengguang Xu To: clm@fb.com, jbacik@fb.com, dsterba@suse.com Cc: linux-btrfs@vger.kernel.org, Chengguang Xu Subject: [PATCH v2] btrfs: remove -ERANGE check and avoid errno overriding in btrfs_get_acl() Date: Sat, 23 Jun 2018 14:38:58 +0800 Message-Id: <20180623063858.10395-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:LPCG5XaqXDaIQewwhyh2fO9Rz+1W7w7ttHXNboanKembDSjtfV+ bzttxdNhKRboto30rV0BVQIavKOwbRhyNAmJcqHiJsjyh6VcZfgoHyriDtACOsKP/UjjDDx MG5I3M515zKVKAwW38N8CW9GkEAu7JhkI8Uz+EAvC70js99FeVmIEQd2v+s7bOG+32044Eq aqf9yc/zzO8Kpso1GXkrg== X-UI-Out-Filterresults: notjunk:1; V01:K0:TWHrWCZFD2I=:vw96kIS0mQRoBn5DsjKLWW tSgfdR8td5nYADy21QqMcXQdEqOn57XRqaNepBOxrJVUUfS2qzvJoKw8ntJYq7FXkWAay47c0 x171jHOh0+DRdgzUOfxg+B1IVKV79W7XIhDoagNcTgUBn9tw7Azez8NXFTnUa0IBLbX0GvOKP JcI5lrDoPmyM2V3T4beMHahoRNdMOxfs6VFUuVoEFLQ/Yi9iB++FcUT2Doth2iwGBZ96JlprK mD1W2/EKQhV2cY1UcEr3jM//DHy19iNF2LUsYfrykw7y2HYPv72nLH5MOCyRjlNghBYTXTRUS ZK2uOiN5Ulqrq6eyzgJNqxSfsd09EiyfPQk+lZ26RMJjB6xE/SdXQReb1wOj9xuAvh+dbjdXG OU9KQ1UoEly6nZV25ar+AWblH7FpI3KrvpQh0TMQ/VGM57otOWiLdYHyJBzUy6IUUojgK+wJs TubdcmVHf2uI7quxwMsW8nWKd2MgVrmJJnQdlOey+cFaEbavb9LkfNV9lzUkvTN6JEQVEGSdJ fx1jDV1+vH28tK3pn//Om+CqtXO73b3TojV208Ar2X4B2QHE7vIiuTnOAyXlXwBpJrJRarIZJ CJw88Jc8YTdaMu9KBzXVMisObTzp/bvZvXq2G+EFpyAcY7n9mc91FlCIbl/XmYZ+LnMtR7EtK ZvCa84ibruMRxo+msjF01s4H0Go1ghd5EGN5JhzYPlLnIbG6D5YK0e0qjCM+0Eob9pMch7OiJ gramSYSJZlxfSchVx3bREq2WDwddbOeAqIW9Xej7KeATY5dczOhsiCYFPbg= Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove -ERANGE error check because there is no chance to get into this condition and meanwhile avoid overriding errno to -EIO in btrfs_get_acl(). Signed-off-by: Chengguang Xu --- v2: - Avoid errno overriding instead of print error message in error case. - Change commit log for better understanding. fs/btrfs/acl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 15e1dfef56a5..b71a875036af 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -40,13 +40,13 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type) return ERR_PTR(-ENOMEM); size = btrfs_getxattr(inode, name, value, size); } - if (size > 0) { + if (size > 0) acl = posix_acl_from_xattr(&init_user_ns, value, size); - } else if (size == -ERANGE || size == -ENODATA || size == 0) { + else if (size == -ENODATA || size == 0) acl = NULL; - } else { - acl = ERR_PTR(-EIO); - } + else + acl = ERR_PTR(size); + kfree(value); return acl;