From patchwork Tue Feb 13 21:37:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 200662 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp822345dyb; Tue, 13 Feb 2024 13:38:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU4ewdP8+YvXA8ouJ2JSve4Mxk1SXK1MPPPxNf1ZLIXRHPprzUZKpzLM7T4vbTV0oju/BL7ym3jUpfYqD41TZpwpno8FQ== X-Google-Smtp-Source: AGHT+IHT2y4chocRRBN10bHJebLmMb8eH9gJHiVaRBlfnBKK8i5ykEg5CbwCi0tx1HmSbd3sGQPl X-Received: by 2002:a50:ee87:0:b0:562:b78:2f71 with SMTP id f7-20020a50ee87000000b005620b782f71mr703499edr.28.1707860299381; Tue, 13 Feb 2024 13:38:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707860299; cv=pass; d=google.com; s=arc-20160816; b=jI6khYp2jTuH/zHELQ2qVT4D4YH0mb5MPPZ6TVhKwlLF5bl5qpkG1bLDVSt7MP+yvH urJR5TIMaiHbQLmqghU9QooqdDQR5HSrbPErXYHKSGVJenDIcqc6+0KJH5B00m0LlP/X Jo32HSc8d6D38G0Ovl9O0kUEewRGX7sPygrpxiPlfhhsa1FQjPXcBPrvsYLcni2OUMmS a+V20D2z4dXoqjWeZ7ecz69kFsueqgoqEOWLIDpe5QzmeV0X2wLrF2wtOuR8020B3wMj Dsf4UJhRNV8GinD2jH0LDXNbPmTkP5R0tu77hkpKiEqMAIvD2nV4+J6WAjMVhw1h0nkH dJcQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:user-agent:references:in-reply-to :message-id:date:cc:to:from:subject:dkim-signature; bh=Kg9PtooROHeKx8fIUbKlppQOORYDMz/IXh3imJbt6ck=; fh=ifzQqXbMVwuKP042Ite/CwEpsvkvGxn2CQCpNe4OVKM=; b=lAxToWmmmGpWhHkwFmZh070uqAPSLIvLOkMzoFY8JZQ75aCgxOewLjCjUigClW6hn1 v8kFcs8nhVTRUOWwSrcMZxiBfpZeEpBmGIgPY/M7Dneyiaa0ZkIZ23Wi+eMR16RXe5OB Mj6vqAuOV949/ItVyDsKJFsLoqcA2p7yJ+O12DF0xXAQSelyO0qwSj0f2rCpBNcAQMrU D5y1hwTq6bsL0oV3vb1hsGHEKPYvfnaTNUoLE2INsXM10GgG80yppzOklRLEh4LZhJ5n 9jDg2B8K1Qv5PKFk80nB4Q0U3zwRXOToUO65zXvg8afZOcA9tyYqvLh+guJa/c96D072 wd8w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Qf4/d1Yg"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-64342-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64342-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=2; AJvYcCVsuHsUUj0Z8Ne0FhBEk/5v/252R1jSx3pHKP75M8oKnsizPvw69vnaK1SqG5fpawnuN4UbxnbcK80wSrj0F146N8Zvqw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id g25-20020a50d5d9000000b00561b9400659si2296827edj.284.2024.02.13.13.38.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 13:38:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64342-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Qf4/d1Yg"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-64342-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64342-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 001A51F25AAA for ; Tue, 13 Feb 2024 21:38:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B543626B2; Tue, 13 Feb 2024 21:37:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Qf4/d1Yg" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E0246216A; Tue, 13 Feb 2024 21:37:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707860247; cv=none; b=bFbN3VGzqtqCVAPxiyxu6/yWZ28O7KFMnEP5/n84RSUCoQhimr/zy3T2IlvjbPYyQ3BojbZ1OapE/SEtXasiPGKFu1wjKEeFyh09s9V9Qm+xGucCnBvItdfUBALXie/Gtjui+3xAU5aKh1ignQZpQ9pf96qqyiy7FCuQkZhi+YU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707860247; c=relaxed/simple; bh=DgxR48FdvStP6/D6Ne/g9o7gPlflm/a2urdscmeMLJk=; h=Subject:From:To:Cc:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=t5HFQiwQeGxylnHZUuPwcMHYVxdeC2vOhdihTRuvN7O1Atv8aDHIdlPiFeCp08X8+Mk1KV2ZJFk0mpNo9q23P/A6mXQWISmRyzONcLXlPNGqSSNdYuGpXVW24X+u3o4X8EyMqa9ybLAAt9ntviAPTqK1oiF9Vwi/0yO6jscAgKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qf4/d1Yg; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FEAFC433C7; Tue, 13 Feb 2024 21:37:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707860247; bh=DgxR48FdvStP6/D6Ne/g9o7gPlflm/a2urdscmeMLJk=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=Qf4/d1YgBMtbSniw/Z88hN4lMjBLBDisTs5pGMp+UPlKkqlI/sbFKI33U7LRO+2ay nZw+t7hHnnJwPjgKmA75MYvWUwvIOtRcjz3V9PQoKiIoqz6xKCa+mEUmeNtI5m/xko SQQBO4/wd0ZrZcGZupAzXrUFuFIawodE9jPpQ6ep8tXj3VS6SNGKgCEYPyJERgFyxb 4/68TNcUkF28v5gcfRkJsUDp3Su9HGYgbFLfdxfM4zAMXfFr5VRJEdc/pvAmBvdD5e mvOJ7KOHuIm9/QluD4G7YhZraRi4VI/iw19vVrf79E9C+AuWSWbxBaJ0bcueJeh/9s +zD9/Ry1/SiRw== Subject: [PATCH RFC 1/7] libfs: Rename "so_ctx" From: Chuck Lever To: viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, hughd@google.com, akpm@linux-foundation.org, Liam.Howlett@oracle.com, oliver.sang@intel.com, feng.tang@intel.com Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, maple-tree@lists.infradead.org, linux-mm@kvack.org, lkp@intel.com Date: Tue, 13 Feb 2024 16:37:25 -0500 Message-ID: <170786024524.11135.12492553100384328157.stgit@91.116.238.104.host.secureserver.net> In-Reply-To: <170785993027.11135.8830043889278631735.stgit@91.116.238.104.host.secureserver.net> References: <170785993027.11135.8830043889278631735.stgit@91.116.238.104.host.secureserver.net> User-Agent: StGit/1.5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790821321604832106 X-GMAIL-MSGID: 1790821321604832106 From: Chuck Lever Most of instances of "so_ctx" were renamed before the simple offset work was merged, but there were a few that were missed. Signed-off-by: Chuck Lever Reviewed-by: Jan Kara --- fs/libfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index eec6031b0155..bfbe1a8c5d2d 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -271,7 +271,7 @@ void simple_offset_init(struct offset_ctx *octx) * @octx: directory offset ctx to be updated * @dentry: new dentry being added * - * Returns zero on success. @so_ctx and the dentry offset are updated. + * Returns zero on success. @octx and the dentry's offset are updated. * Otherwise, a negative errno value is returned. */ int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry) @@ -430,8 +430,8 @@ static bool offset_dir_emit(struct dir_context *ctx, struct dentry *dentry) static void *offset_iterate_dir(struct inode *inode, struct dir_context *ctx) { - struct offset_ctx *so_ctx = inode->i_op->get_offset_ctx(inode); - XA_STATE(xas, &so_ctx->xa, ctx->pos); + struct offset_ctx *octx = inode->i_op->get_offset_ctx(inode); + XA_STATE(xas, &octx->xa, ctx->pos); struct dentry *dentry; while (true) {