From patchwork Wed Mar 29 19:24:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 76773 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp643921vqo; Wed, 29 Mar 2023 12:40:27 -0700 (PDT) X-Google-Smtp-Source: AK7set8IspqyhSmLHRu1MZUGCo45mO+TT/r/vhmuGle89HQKefwD8IGp50NiL10g1+kWulJ3VL8o X-Received: by 2002:a05:6a20:bf26:b0:d5:635c:eaa2 with SMTP id gc38-20020a056a20bf2600b000d5635ceaa2mr17431512pzb.14.1680118827326; Wed, 29 Mar 2023 12:40:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680118827; cv=none; d=google.com; s=arc-20160816; b=UDGSEbVSbNaYaXtWP2idxbQHQsmO3awxjyk14epupsnxEpCab3jEvA5Y8o7mKFEuWN LPHN1V0+OOnKIKQmcsL3qoFvK5ec4I3yNl+SnBDlf5RsvuBVSLkX3JQK1IkVfyCaInRv /g8hLRrNv9xch6UeoEbGcg7n9BR4UubnPV+TnlzF8Frh04S23JhSYWtyXNjANStDv2X5 1MkdbgIoy86Ti4YxtITb8Eih6KNZQ3lMiHfCV6EkuJ65OwXdZOpldsyu6OlBumVsk1Hp 7n8gS4QfzJgTXggf9jqTywqYeSiLWXprIsLBL4cTc7UUDNfBkPaS2ifRix/QaznAjyLY W67w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=N7AwOnf5UM7shJ9CVY4E2LMpHax+EFAoUiCke3vsf10=; b=LcxYivQHObYobe2M/LbRiMitr9M+rhMqBrqCo82JwfR30jux1y0YyCzWlU7dDh4bSY u4/K2LAXOB4LHmMi1dhSjfdxnJFjlxdlpF3OW2xtT+ybIobISb326kYDQZ2r9qJru9NE wzm9PWM7rob69Z1KTiIEEAEbVAQ8T36Q8IF9oZ30nHXBASCbTxrMjA+eWGdMr8UzefEU dxStxPSvMM8NcmGAX9/6KgsRD2b5MyY2uHOfqoSJ7ojaHNUbhUjRg2agbD+tSB3ZvNl0 K3y2OMSE62j5t1UrMYLJ0D7wzgILnCoH4C2XFsfdKgQ8d7k+2UMFpX/lhgfYpHr/Omil v2jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JgJ+TBEp; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z31-20020a630a5f000000b0050b30b20470si31580290pgk.82.2023.03.29.12.40.14; Wed, 29 Mar 2023 12:40:27 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JgJ+TBEp; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230296AbjC2TYo (ORCPT + 99 others); Wed, 29 Mar 2023 15:24:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbjC2TYm (ORCPT ); Wed, 29 Mar 2023 15:24:42 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 883D1183; Wed, 29 Mar 2023 12:24:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 226C3B82421; Wed, 29 Mar 2023 19:24:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F9BCC4339B; Wed, 29 Mar 2023 19:24:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680117867; bh=Yj5CWkJU2gvuxeAY0aIxYuYvi2UBA2ZtNvQ63ELK7qw=; h=From:To:Cc:Subject:Date:From; b=JgJ+TBEpSL+zxwfV51IJHTcGmsTT0MVxHdayLaAVhGt7xeP7HYGh4gE5TrOQpAKyd TLeKnpfCleqLnMlNWGAR6v3qdvCZKss6XyD3+NARWrU7gIAy6CGOFau2PgE7DrneIf 5x80Sw/+FIsITc42deSJcR+MaaMyqq2VRQx5nQ6VMLYNKVdW+FiTMbWmj41ff+opg4 31wWY1dAI397Ss9epIjgnKaUzcfEFyRr6r8aauY6MO4P10WQGi9byLV9Sn+Qgq+Mht k4HFmahLqXtmZQifwKyFAdCk1+8xYw25sTsG7FhTJ7CBXJ4Sb90LWamWfDrQRPpfCc J5AZEzc3YQjXg== From: Jeff Layton To: Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , Joel Becker , Christoph Hellwig , Greg Kroah-Hartman , Tejun Heo , Alexander Viro , Christian Brauner Cc: Chuck Lever , v9fs-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH] fs: consolidate dt_type() helper definitions Date: Wed, 29 Mar 2023 15:24:23 -0400 Message-Id: <20230329192425.194793-1-jlayton@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-5.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS 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?1761732279539022686?= X-GMAIL-MSGID: =?utf-8?q?1761732279539022686?= There are 4 functions named dt_type() in the kernel. Consolidate the 3 that are basically identical into one helper function in fs.h that takes a umode_t argument. The v9fs helper is renamed to distinguish it from the others. Cc: Chuck Lever Signed-off-by: Jeff Layton Acked-by: Greg Kroah-Hartman --- fs/9p/vfs_dir.c | 6 +++--- fs/configfs/dir.c | 8 +------- fs/kernfs/dir.c | 8 +------- fs/libfs.c | 9 ++------- include/linux/fs.h | 6 ++++++ 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c index 3d74b04fe0de..80b331f7f446 100644 --- a/fs/9p/vfs_dir.c +++ b/fs/9p/vfs_dir.c @@ -41,12 +41,12 @@ struct p9_rdir { }; /** - * dt_type - return file type + * v9fs_dt_type - return file type * @mistat: mistat structure * */ -static inline int dt_type(struct p9_wstat *mistat) +static inline int v9fs_dt_type(struct p9_wstat *mistat) { unsigned long perm = mistat->mode; int rettype = DT_REG; @@ -128,7 +128,7 @@ static int v9fs_dir_readdir(struct file *file, struct dir_context *ctx) } over = !dir_emit(ctx, st.name, strlen(st.name), - v9fs_qid2ino(&st.qid), dt_type(&st)); + v9fs_qid2ino(&st.qid), v9fs_dt_type(&st)); p9stat_free(&st); if (over) return 0; diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index 4afcbbe63e68..43863a1696eb 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c @@ -1599,12 +1599,6 @@ static int configfs_dir_close(struct inode *inode, struct file *file) return 0; } -/* Relationship between s_mode and the DT_xxx types */ -static inline unsigned char dt_type(struct configfs_dirent *sd) -{ - return (sd->s_mode >> 12) & 15; -} - static int configfs_readdir(struct file *file, struct dir_context *ctx) { struct dentry *dentry = file->f_path.dentry; @@ -1654,7 +1648,7 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx) name = configfs_get_name(next); len = strlen(name); - if (!dir_emit(ctx, name, len, ino, dt_type(next))) + if (!dir_emit(ctx, name, len, ino, dt_type(next->s_mode))) return 0; spin_lock(&configfs_dirent_lock); diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index ef00b5fe8cee..0b7e9b8ee93e 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -1748,12 +1748,6 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent, return error; } -/* Relationship between mode and the DT_xxx types */ -static inline unsigned char dt_type(struct kernfs_node *kn) -{ - return (kn->mode >> 12) & 15; -} - static int kernfs_dir_fop_release(struct inode *inode, struct file *filp) { kernfs_put(filp->private_data); @@ -1831,7 +1825,7 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx) pos; pos = kernfs_dir_next_pos(ns, parent, ctx->pos, pos)) { const char *name = pos->name; - unsigned int type = dt_type(pos); + unsigned int type = dt_type(pos->mode); int len = strlen(name); ino_t ino = kernfs_ino(pos); diff --git a/fs/libfs.c b/fs/libfs.c index 4eda519c3002..d0f0cdae9ff7 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -174,12 +174,6 @@ loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence) } EXPORT_SYMBOL(dcache_dir_lseek); -/* Relationship between i_mode and the DT_xxx types */ -static inline unsigned char dt_type(struct inode *inode) -{ - return (inode->i_mode >> 12) & 15; -} - /* * Directory is locked and all positive dentries in it are safe, since * for ramfs-type trees they can't go away without unlink() or rmdir(), @@ -206,7 +200,8 @@ int dcache_readdir(struct file *file, struct dir_context *ctx) while ((next = scan_positives(cursor, p, 1, next)) != NULL) { if (!dir_emit(ctx, next->d_name.name, next->d_name.len, - d_inode(next)->i_ino, dt_type(d_inode(next)))) + d_inode(next)->i_ino, + dt_type(d_inode(next)->i_mode))) break; ctx->pos++; p = &next->d_child; diff --git a/include/linux/fs.h b/include/linux/fs.h index c85916e9f7db..777a3641fc5d 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2885,6 +2885,12 @@ extern void iterate_supers(void (*)(struct super_block *, void *), void *); extern void iterate_supers_type(struct file_system_type *, void (*)(struct super_block *, void *), void *); +/* Relationship between i_mode and the DT_xxx types */ +static inline unsigned char dt_type(umode_t mode) +{ + return (mode >> 12) & 15; +} + extern int dcache_dir_open(struct inode *, struct file *); extern int dcache_dir_close(struct inode *, struct file *); extern loff_t dcache_dir_lseek(struct file *, loff_t, int);