From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 424AFC83F12 for ; Tue, 29 Aug 2023 13:05:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A03F728001A; Tue, 29 Aug 2023 09:05:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B4308E001A; Tue, 29 Aug 2023 09:05:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87BBB28001A; Tue, 29 Aug 2023 09:05:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7622A8E001A for ; Tue, 29 Aug 2023 09:05:53 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 414438012B for ; Tue, 29 Aug 2023 13:05:53 +0000 (UTC) X-FDA: 81177164586.02.B23FC18 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id B706518001F for ; Tue, 29 Aug 2023 13:05:50 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Q3QmRgXT; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693314351; a=rsa-sha256; cv=none; b=L8S/cpxpHqdd2gi8AaHQpZ///7sINdn8jCABV3T82kvGgmNVYwcpQ3De6wjNeM5b5V4CdX kZEt2rwfUBdzcawvIyaft+EANwZ1qle7q0uf5gkpMvXDKlFV2ucT+PPkAvOdnPdW2OAt4M eoSQN7YtuTJ0/OQHPlJygxfh3uABtWU= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Q3QmRgXT; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693314351; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RchKoATVAdQvPJfSjQ7igQ4w+5FVPwMefhSLf5vYpSI=; b=wW4tz2FlMpYSORH4JXsjlPRpHb9ZmWR9oTMLDeSb4F6dTSqGyYMekZnCzlAFZuG3LHBdZE jcNGg/kj0OfeDXVNQ4Qu1mxGAGY5obY7lyjIq9K/3s1QTuwBTLKNGz1+nOU/Ahgtc/Xn6b mO5Lx5D5fJz5Ylc7h74k5WOHioi2vuk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=RchKoATVAdQvPJfSjQ7igQ4w+5FVPwMefhSLf5vYpSI=; b=Q3QmRgXTehCOZCVueX+FS2Az5N PVqmWnEC5SOyltZJNMDkbuPj3BuxIKobdTkUGJdkwt9An23qab7RWIeUTJvkRcM5ZQw7A9VajHpfv K7r2l3ZZ2pGC+tetoYQU12TmTvlZI3sm3ayVKtCD8x7/yd2j9SuUz7gnHbMb8LXGAJC6qfT96aNHD /+KAN9szQKpq1/b+zh8evtWeBszURne3cpQtIIZ5DUWss+rP/RkNTx5Y/tCCASZPZaSLUEyAkYJWx 0SrCGJoWwn5s3UmnWTZbObVE6DrneAPDreiurlPZ6M22SpYEkwQtVmJFqXgm29PIZAfXouLOFvP7I 44OUuuBQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qayP8-006i8Z-JC; Tue, 29 Aug 2023 13:05:10 +0000 Date: Tue, 29 Aug 2023 14:05:10 +0100 From: Matthew Wilcox To: Hao Xu Cc: io-uring@vger.kernel.org, Jens Axboe , Dominique Martinet , Pavel Begunkov , Christian Brauner , Alexander Viro , Stefan Roesch , Clay Harris , Dave Chinner , "Darrick J . Wong" , linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-cachefs@redhat.com, ecryptfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-unionfs@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-mm@kvack.org, linux-nilfs@vger.kernel.org, devel@lists.orangefs.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-mtd@lists.infradead.org, Wanpeng Li Subject: Re: [PATCH 02/11] xfs: add NOWAIT semantics for readdir Message-ID: References: <20230827132835.1373581-1-hao.xu@linux.dev> <20230827132835.1373581-3-hao.xu@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: B706518001F X-Stat-Signature: 7juey4uq1xa8gshkfi63g46ac7e4tgdd X-Rspam-User: X-HE-Tag: 1693314350-717771 X-HE-Meta: U2FsdGVkX18/SRrbrf0wqBaMbuI9daCy/y/QbHn4y1Pkvdcjk+qnreOhueYc1luH2T1zG1SWZGHAKpOluo+jKI2EQJmeOu5rLQRU8g+5BnnLQ5S+Kaa0CcE+JZi9LOuBr5Fa38I6hb0andN4vO4yDLlUjIZ8ya39SJI2WnbfFRWPLjR/18XHJQHtwV/aNi259aHuCdXja+WuyCMaQ2dy5uaT66fcj+AyyabUVuOjpbuOjhR8XRKZ5UwPfCVwUM9cUpo54N0LX5odKW6N1/Y7yci0A1JjuvWDEvKIPNAIveAPu8utWF1fZHDBP0w8BCT9cMwNxJWtWiK5yKX/xeX7/8EIjtobOjjb+VcRlmaFZJJMStDKCxwlGX2jcUA/ITPuAw5QAbRuureuLejeNg+gP6lv8qNwKAhWiqJIz+5fHlLs1xLdj+EglSEqLtZBbkEX+887pQXgqjy7dpmWtfIpAOdaxoMURlm2vkhgun3TuW4CvAwyIWA5E/vjBXOiB+Vjil+ny4IZd0UI7mugnOwMIKC90UJ18OGbB9cpB8QPGCwxbNmEkdoiVMFeMzRH3cbL+MQz/7cU/dE8zcLFjYPUI/rMyT/ANaIksQhB+2B5nUDlMIrkH/19ObkVbwLRNVbTGkZIB4NjPUnL0ILGxrlviDqkWAgWB8LLRM/PsMpJMzObnU2Qgbh6T5VJMCijBKDXqG9TkeWaxWE7evtJ4SYpVmHrAMnfqi7+XUE3HZSK0iIA5hDpPmJXhRkCpk6vHi22YYEVBzLQbo9fFAgvs/cx/hI4OzQG8uvStanCjrRX8zn4ErNw8rxfd+GYNKH31U07XhUtHs+D710H+lRNjK1YJUhfB5kmRgSVs3nvAHR79TediD+tght0W/gKWnabqgWHP6HmpOSeDxo9xDU5fqo7hhSAARngbw+zrjipTvG+CYE6E+6o6PrlZ9l9f7t+Zb2k1JEw9YT2UKYGzSsMYjg bnqBsnpa Nv7P9muinTLPhJprxWSQ+vymCNzGkuZSJqRIEjwdhj+dzRsgLxhDxKcbFicwDwjfloUIwe+N97HzlRQvN5uRUTlugmuu5ufv4ZKcTyQE/lSQLqFC8aofU4CR+zgqwAcrqQft0m3CRNsIVztjcDJvtESZVFK6UsOblJEhkdaKmFii9du1KKXaZpTvEDRoGzBxfFEzIUhg3sXHAYgl6aa+SNC8b1w== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Tue, Aug 29, 2023 at 03:41:43PM +0800, Hao Xu wrote: > On 8/28/23 04:44, Matthew Wilcox wrote: > > > @@ -391,10 +401,17 @@ xfs_dir2_leaf_getdents( > > > bp = NULL; > > > } > > > - if (*lock_mode == 0) > > > - *lock_mode = xfs_ilock_data_map_shared(dp); > > > + if (*lock_mode == 0) { > > > + *lock_mode = > > > + xfs_ilock_data_map_shared_generic(dp, > > > + ctx->flags & DIR_CONTEXT_F_NOWAIT); > > > + if (!*lock_mode) { > > > + error = -EAGAIN; > > > + break; > > > + } > > > + } > > > > 'generic' doesn't seem like a great suffix to mean 'takes nowait flag'. > > And this is far too far indented. > > > > xfs_dir2_lock(dp, ctx, lock_mode); > > > > with: > > > > STATIC void xfs_dir2_lock(struct xfs_inode *dp, struct dir_context *ctx, > > unsigned int lock_mode) > > { > > if (*lock_mode) > > return; > > if (ctx->flags & DIR_CONTEXT_F_NOWAIT) > > return xfs_ilock_data_map_shared_nowait(dp); > > return xfs_ilock_data_map_shared(dp); > > } > > > > ... which I think you can use elsewhere in this patch (reformat it to > > XFS coding style, of course). And then you don't need > > xfs_ilock_data_map_shared_generic(). > > How about rename xfs_ilock_data_map_shared() to xfs_ilock_data_map_block() > and rename xfs_ilock_data_map_shared_generic() to > xfs_ilock_data_map_shared()? > > STATIC void xfs_ilock_data_map_shared(struct xfs_inode *dp, struct > dir_context *ctx, unsigned int lock_mode) > { > if (*lock_mode) > return; > if (ctx->flags & DIR_CONTEXT_F_NOWAIT) > return xfs_ilock_data_map_shared_nowait(dp); > return xfs_ilock_data_map_shared_block(dp); > } xfs_ilock_data_map_shared() is used for a lot of things which are not directories. I think a new function name is appropriate, and that function name should include the word 'dir' in it somewhere.