From patchwork Mon Jun 12 12:37:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingbo Xu X-Patchwork-Id: 106572 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2564771vqr; Mon, 12 Jun 2023 05:56:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5zvYjyZs+H/zGu3eBrT0f3B+CBa6FPUrzrU0xQ/Nu3PsjxlM4BjBKPPh6o7B4iBVPWswQU X-Received: by 2002:a05:6a21:3888:b0:10f:9317:1539 with SMTP id yj8-20020a056a21388800b0010f93171539mr7845088pzb.32.1686574603823; Mon, 12 Jun 2023 05:56:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686574603; cv=none; d=google.com; s=arc-20160816; b=OeP3NJpWbnfJmoAuCdrm5Q7Xqyc8q0/exOjAY+uluUVnQg/WtFy9nOp45z0b1wE1jR 2HrMoeREI86srOvK+7dZfen+OweNCRodO6JpM+Xj3TkkmLeV681nozPmJFQG/MtEkvcb JAQ+RMaewwYLhIj/M1DBUJW7/teqJarx9S+7z3VZ39x7+JvzAlfeIWDzFNCFMblPG9gN W26hfc3kn+DWVCCyHdJcW7E73f1BOgkpAjSrX+HP2Q+VQuSinvmNzzRajX3mcrqEHKBU DQG4UF3Yh+U8L4Jj6IaYoWNW7kM2pdPwZzWwNeftJNXOyAnkl35GG8baV6sgd7VrysdL 7QLQ== 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=5CH4qmGTEswLKkIHRBvy3oA0lCQL8ln1Im8LoIxDWfc=; b=IdO2AqZHvKoqF1gsyDMRp4+mK3P6ggXSd5ZjN3tlOGLqrVBEnSlkMefPltv+4/5Up1 ODCVPz2aj0vQtp4IKWXpcrSAnjojltPnNg0UjsC9CBsPqtuIP2bbZwoZ/5/4I0+a2kAX 2dPMNuUtEuShOHvw3RpRHxhYpg/Iix3cl8oBV0VQp4Jrd1LXYqp7gHn8hRwOqdR8edB3 7aypXvVrK0W67jOs/BBoKCC/y7YfKMXskrRmXhTa9zn5NQrvLA3/5x+g/hwA/xoa8kBW WPBdtz5BLSq7r9fr3f5l6JiaBROHt+5tOY5/EoxoUswFSrIyb6x48vDdCTsj+yxVpA1F nqSg== 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 w17-20020a637b11000000b00542ad6380a3si6683887pgc.881.2023.06.12.05.56.29; Mon, 12 Jun 2023 05:56:43 -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 S234803AbjFLMiF (ORCPT + 99 others); Mon, 12 Jun 2023 08:38:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234377AbjFLMhy (ORCPT ); Mon, 12 Jun 2023 08:37:54 -0400 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13DDDE47 for ; Mon, 12 Jun 2023 05:37:52 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045176;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0VkzU.DN_1686573469; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VkzU.DN_1686573469) by smtp.aliyun-inc.com; Mon, 12 Jun 2023 20:37:50 +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 v7 3/5] erofs: make the size of read data stored in buffer_ofs Date: Mon, 12 Jun 2023 20:37:43 +0800 Message-Id: <20230612123745.36323-4-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230612123745.36323-1-jefflexu@linux.alibaba.com> References: <20230612123745.36323-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham 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?1768501652135082306?= X-GMAIL-MSGID: =?utf-8?q?1768501652135082306?= Since now xattr_iter structures have been unified, make the size of the read data stored in buffer_ofs. Don't bother reusing buffer_size for this use, which may be confusing. This is in preparation for the following further cleanup. Signed-off-by: Jingbo Xu Reviewed-by: Gao Xiang --- fs/erofs/xattr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index b2802121e3aa..8a114c7b6c66 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -315,7 +315,7 @@ static int xattr_checkbuffer(struct erofs_xattr_iter *it, { int err = it->buffer_size < value_sz ? -ERANGE : 0; - it->buffer_size = value_sz; + it->buffer_ofs = value_sz; return !it->buffer ? 1 : err; } @@ -348,7 +348,7 @@ static int inline_getxattr(struct inode *inode, struct erofs_xattr_iter *it) if (ret != -ENOATTR) break; } - return ret ? ret : it->buffer_size; + return ret ? ret : it->buffer_ofs; } static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *it) @@ -371,7 +371,7 @@ static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *it) if (ret != -ENOATTR) break; } - return ret ? ret : it->buffer_size; + return ret ? ret : it->buffer_ofs; } static bool erofs_xattr_user_list(struct dentry *dentry)