From patchwork Thu Mar 30 08:29:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingbo Xu X-Patchwork-Id: 76958 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp970296vqo; Thu, 30 Mar 2023 01:39:39 -0700 (PDT) X-Google-Smtp-Source: AKy350Y48TkvMvJBfycyHW95Ty/0PA5JRcuivS37H7d7xxJKdLI640mXBrJDZh46bxlxQbSt4Sum X-Received: by 2002:aa7:99de:0:b0:62d:b97f:e299 with SMTP id v30-20020aa799de000000b0062db97fe299mr3720017pfi.13.1680165579495; Thu, 30 Mar 2023 01:39:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680165579; cv=none; d=google.com; s=arc-20160816; b=lyHgjCm89Tkv4zmP3CAe20XVtYAsiZUxxGlXAMVmFoyVRPxX7dyNz3/idd/8bp9wZq uz0C0txTiZIjrP43HXMsqPi1QGWEy4LVntwjts9as+N/MO5AEr0ldexgXgC+bpO/xR9P wYIqr3p0MfJi4l9fzgJu50Jn9GtKecHQYf3BYKUlPWfCczu2MEESO65C/OKAbAfRUEnU 6lb8VWAtkh0F4ZrvL+VALWl8bjGZQBHk5l3dU5C9m/0klhvR2g+VojU738JYzvlVHLDZ WdudIJGqFaKX7voU24WLCDnZ1zTolviyrhWd9wxPkPw3k7NvQcRTjD5mAExa80LYdo+C p22A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=u/p7uOnb3zCsiBVXEJNg/AZErMEAGOQK17b0poruzmg=; b=RTycjK9QlEUzi7mSzMs6PobTQTtQvAnRz4uVG0rwZcKzNropw9WXiF5EAVbwsoLu27 l+EgXHBkbrJij1zGFLVABbc/JuzISGGMTXJvTgIgBglayevTT8R4UzW/a4Qs6hwbi58P dTC98NJb1qbe0FIfeP06/MEatbIMX9gXSDMYEECZjq1d3W8qzoMXU9sN/OxSaafge86X 1Zjkp5bhkPaODf2MRoBgLJeEn8QExgvxy/qcDkzDy0M3lHttR/5ri2ve7Z5rt9KxSAGm XixVu7aycoRPadSJp0SGlZklo5zXuX3LHX4FnVqWWnk3iflIMA85GzWsTVYgvnNzvsLG beIA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m17-20020a62f211000000b00628f842de80si19575192pfh.216.2023.03.30.01.39.26; Thu, 30 Mar 2023 01:39:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230424AbjC3I3V (ORCPT + 99 others); Thu, 30 Mar 2023 04:29:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230363AbjC3I3S (ORCPT ); Thu, 30 Mar 2023 04:29:18 -0400 Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF025E4 for ; Thu, 30 Mar 2023 01:29:16 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R641e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Vezpke1_1680164953; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Vezpke1_1680164953) by smtp.aliyun-inc.com; Thu, 30 Mar 2023 16:29:14 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 3/8] erofs: simplify erofs_xattr_generic_get() Date: Thu, 30 Mar 2023 16:29:05 +0800 Message-Id: <20230330082910.125374-4-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230330082910.125374-1-jefflexu@linux.alibaba.com> References: <20230330082910.125374-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-8.0 required=5.0 tests=ENV_AND_HDR_SPF_MATCH, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761781302581844366?= X-GMAIL-MSGID: =?utf-8?q?1761781302581844366?= erofs_xattr_generic_get() won't be called from xattr handlers other than user/trusted/security xattr handler, and thus there's no need of extra checking. Signed-off-by: Jingbo Xu Reviewed-by: Gao Xiang Reviewed-by: Yue Hu Reviewed-by: Chao Yu --- fs/erofs/xattr.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index dc36a0c0919c..d76b74ece2e5 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -432,20 +432,9 @@ static int erofs_xattr_generic_get(const struct xattr_handler *handler, struct dentry *unused, struct inode *inode, const char *name, void *buffer, size_t size) { - struct erofs_sb_info *const sbi = EROFS_I_SB(inode); - - switch (handler->flags) { - case EROFS_XATTR_INDEX_USER: - if (!test_opt(&sbi->opt, XATTR_USER)) - return -EOPNOTSUPP; - break; - case EROFS_XATTR_INDEX_TRUSTED: - break; - case EROFS_XATTR_INDEX_SECURITY: - break; - default: - return -EINVAL; - } + if (handler->flags == EROFS_XATTR_INDEX_USER && + !test_opt(&EROFS_I_SB(inode)->opt, XATTR_USER)) + return -EOPNOTSUPP; return erofs_getxattr(inode, handler->flags, name, buffer, size); }