From patchwork Fri Feb 9 16:40:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 198995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp983944dyd; Fri, 9 Feb 2024 08:52:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IF637CCvLgfqyrVyMzrHo9+AFfyKuzxIY09J1YMdNtThoytXsEk/K6yFPwzRQYmfMvtkFxS X-Received: by 2002:a05:6a00:1806:b0:6dd:a086:1e0f with SMTP id y6-20020a056a00180600b006dda0861e0fmr2680502pfa.32.1707497523242; Fri, 09 Feb 2024 08:52:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707497523; cv=pass; d=google.com; s=arc-20160816; b=MFTol/VYSxUcPEEjaFBYyDt4iWJSvNc3WEeVDPWvoBPeSdMbNbpbZHcP2nynYVCLWU J2DHLPGUKlxQQae4/dNS652Wjo6ALG92NQfaQ46Ez5TdX4s5k9j/DVXX9QAnAd9BVY+d CnMyAWic7tEBGNLatwxCqHNqr73VN7pae6IQStRmmw97SmJ73hoUaa9ADSr0ttfpgpyw ZlOGxMuGHmqBYXhVVm9hp/3e0Kdz7YLG9lS17Hrp1zLX/t7v7Nl1rigMRuEaw7dtlLqM bGgM8EtZ17g4WhSdb9qTLsX3Cl3iCbNr/5ocKkThTET17/8k+/OKs+wZHbLhuEyFL44b gfMg== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ULoKxp+mUpIb8o5pOMUhCUk1LDRRY2hj78IQ7Yi6k2Q=; fh=It08rM6e5OYBZbUCJNrsqcndyA1cGHe0ECeZauewS44=; b=oWKUDyiNPUBYDWrd74kEoCCMjaM3rrnvP7nmkNMyGIS9j4StodNmRqKe6DLsh2OXXV tuooea+/Am3Rsf2V5nIWBydMngQWiHJQT8sCYABAl9w7O2eU1ZVvprXmxr9gQSBmVqBu cObt6KpkkofZI3GacO5jrC/iTTgMvt5ChRObo8F9Ps+ik2bVKBBs4Dyjn7YIXTuKYUzd kxfSXRrMNfHqP8tbhabDTSOaEIKpCQhul4MfuXRur4PZpBBMy/3lKJ+iSvqZ0YflmjSW CNYzQcxoSKnFkghOl0wNsgCiKp9nRRytE4ZN5lEpQSmnTqNWwrxM/4WztlGrmg/9qChG BAhQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b="VjPwIOl/"; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-59646-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59646-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCVwm3NZxW2CJV8uraeXcn/j9h+hUgBx8khU9wdS30pt3Hx8YN1pw/MgmFGIZLBNMKZHlQI4cPwMY6Ca9V0A5+mlLluPXw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id u32-20020a056a0009a000b006e033b371b0si593615pfg.133.2024.02.09.08.52.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:52:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59646-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b="VjPwIOl/"; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-59646-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59646-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 241712832B5 for ; Fri, 9 Feb 2024 16:47:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B2EEC12C556; Fri, 9 Feb 2024 16:41:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="VjPwIOl/" Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D17981272D3 for ; Fri, 9 Feb 2024 16:41:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496877; cv=none; b=o4YThzVzkT4rMbmtvH9Bk9PWGRGXOwIfx/JYNSaClpai6tdHLMIw01b0bdrLrx8lw4REplFrq+/YVcHkhf5MZahjNg1hxCWKRBzH9XLunFNfWbEexwDhmNbwTQ/38sr8//GV71xa0mwkCYGVkbXfOWx5bofV1dTfzUMl2Cav9Bc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496877; c=relaxed/simple; bh=Jk9++ZI9K5g/l3vneedAtiFBwT5nQ9V1AG9tXtn14Z4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fwhwhmEDqQeOOckQD4wfj0bmaDSU4jTCQPkDA7maWv6wgRMvBrvCXn2fAso4yAmUkL406U+HGngZN5iEDONeSFVQBwOMboG1mVSyMTv41xsEbveVllGt2l1pDx3tqD+h6M/sAHQ4NuPoe6fOd1jIwK2N+K3Vhja0ms7aE5obMaA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=VjPwIOl/; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a271a28aeb4so143309966b.2 for ; Fri, 09 Feb 2024 08:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707496871; x=1708101671; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ULoKxp+mUpIb8o5pOMUhCUk1LDRRY2hj78IQ7Yi6k2Q=; b=VjPwIOl/aiFSax4U4gQ7W0mgEt1vcruONCq8YmB2qPIbHBYN6PiK4GAadjfAcZXFI3 Ul10lp8XhBN1gsxzfN5uh0B1kqddSB1qc9GZP3fofEJwBcLOf9bzvkHBr91JWz6cpH7s m6Tf3zIf8NqctOwAqnQBAtISxZMZHRoc8ZFY0hgUtdBFmHZFmCLQKJL/yxYROYuBXZsB Vc/nYk5Xgcpq+2sJ7tyqrok+JA3dOB8fnOasMB3zMHBj7kUF37wucQb/mVE1JrAnjGEA E7aPHX78RXMbYS3ew+gpYdLzz5icKH/Mwj5er/CabE0u23bbBml8FYvTZtHkeRr+1l46 4aZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707496871; x=1708101671; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ULoKxp+mUpIb8o5pOMUhCUk1LDRRY2hj78IQ7Yi6k2Q=; b=IGg3bWqI0lh5nMuKJaImrYrfAQOpFF0+Qh+P3OELUpGqzIrpneGLou7MP3PxCL3sXv Ke6nwp4XRACtKlI92O+CV8P26Q/RF2MNWM96m5+mv3gvjBmJ2Y5l/5D/9H+4/Ne7L84w dI2ATQPO128DBuEcj67lewWT89vdk5/R186dFqkiC77v3z7jiOtzavm47yWk+kf7Ye1c w6PjWKd2v8DTO6fO1JxiTkYS2vETfwvzxV8hhIw7BN1J9i1VOetlT/QdaovPAll6aPKz 9sVMxoOKgTWWC210Z0hr/OiBMmltveNhnUzFRLsNb61ZpIQeX20yWr0P2EXTflXFrs5q RrIw== X-Gm-Message-State: AOJu0YyJaF5hZ8nR1BJMICk3naiaYX7hbTN3+CAonNMbairCfuDzrFK9 avV4jcOGM68QiKXFJIA699llBMZUweoc9LD6yXKHL02j0ktqcBr+qZpnSKnURXJp4fBa0Bxapwl G X-Received: by 2002:a17:906:ecb0:b0:a3b:c221:8598 with SMTP id qh16-20020a170906ecb000b00a3bc2218598mr1674181ejb.9.1707496871602; Fri, 09 Feb 2024 08:41:11 -0800 (PST) Received: from raven.intern.cm-ag (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id tl27-20020a170907c31b00b00a3bfe97fe27sm477724ejc.218.2024.02.09.08.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:41:10 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v2 27/35] quota.h: move declarations to quota_types.h Date: Fri, 9 Feb 2024 17:40:19 +0100 Message-Id: <20240209164027.2582906-28-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240209164027.2582906-1-max.kellermann@ionos.com> References: <20240209164027.2582906-1-max.kellermann@ionos.com> 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: 1790440923259415055 X-GMAIL-MSGID: 1790440923259415055 By providing declarations in a lean header, we can reduce header dependencies. Signed-off-by: Max Kellermann --- fs/gfs2/incore.h | 1 + fs/xfs/xfs_qm.h | 1 + fs/xfs/xfs_qm_syscalls.c | 2 ++ fs/xfs/xfs_quotaops.c | 1 + fs/xfs/xfs_super.c | 1 + fs/xfs/xfs_trans_dquot.c | 2 ++ include/linux/fs.h | 2 +- include/linux/quota.h | 33 +----------------- include/linux/quota_types.h | 68 +++++++++++++++++++++++++++++++++++++ 9 files changed, 78 insertions(+), 33 deletions(-) create mode 100644 include/linux/quota_types.h diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 95a334d64da2..94f945dc4bdb 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h index d5c9fc4ba591..bb111cbc3567 100644 --- a/fs/xfs/xfs_qm.h +++ b/fs/xfs/xfs_qm.h @@ -9,6 +9,7 @@ #include "xfs_dquot_item.h" #include "xfs_dquot.h" +struct qc_dqblk; struct xfs_inode; extern struct kmem_cache *xfs_dqtrx_cache; diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c index 392cb39cc10c..1de4443bed40 100644 --- a/fs/xfs/xfs_qm_syscalls.c +++ b/fs/xfs/xfs_qm_syscalls.c @@ -19,6 +19,8 @@ #include "xfs_qm.h" #include "xfs_icache.h" +#include + int xfs_qm_scall_quotaoff( xfs_mount_t *mp, diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c index 9c162e69976b..eda56d032734 100644 --- a/fs/xfs/xfs_quotaops.c +++ b/fs/xfs/xfs_quotaops.c @@ -15,6 +15,7 @@ #include "xfs_icache.h" #include "xfs_qm.h" +#include static void xfs_qm_fill_state( diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 5013d71143c2..615ba5b1bd1c 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -49,6 +49,7 @@ #include #include #include +#include static const struct super_operations xfs_super_operations; diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index aa00cf67ad72..94214f0baa2b 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -18,6 +18,8 @@ #include "xfs_trace.h" #include "xfs_error.h" +#include + STATIC void xfs_trans_alloc_dqinfo(xfs_trans_t *); /* diff --git a/include/linux/fs.h b/include/linux/fs.h index 1cfe76f7544e..a7e65358ebc0 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -260,7 +260,7 @@ struct iattr { /* * Includes for diskquotas. */ -#include +#include /* * Maximum number of layers of fs stack. Needs to be limited to diff --git a/include/linux/quota.h b/include/linux/quota.h index 956281c84850..2a3040e61072 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -32,9 +32,8 @@ #ifndef _LINUX_QUOTA_ #define _LINUX_QUOTA_ -#include +#include #include -#include #include #include @@ -45,7 +44,6 @@ #include #include #include -#include #undef USRQUOTA #undef GRPQUOTA @@ -61,9 +59,6 @@ enum quota_type { #define QTYPE_MASK_GRP (1 << GRPQUOTA) #define QTYPE_MASK_PRJ (1 << PRJQUOTA) -typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */ -typedef long long qsize_t; /* Type in which we store sizes */ - struct kqid { /* Type in which we store the quota identifier */ union { kuid_t uid; @@ -213,24 +208,6 @@ struct mem_dqblk { time64_t dqb_itime; /* time limit for excessive inode use */ }; -/* - * Data for one quotafile kept in memory - */ -struct quota_format_type; - -struct mem_dqinfo { - struct quota_format_type *dqi_format; - int dqi_fmt_id; /* Id of the dqi_format - used when turning - * quotas on after remount RW */ - struct list_head dqi_dirty_list; /* List of dirty dquots [dq_list_lock] */ - unsigned long dqi_flags; /* DFQ_ flags [dq_data_lock] */ - unsigned int dqi_bgrace; /* Space grace time [dq_data_lock] */ - unsigned int dqi_igrace; /* Inode grace time [dq_data_lock] */ - qsize_t dqi_max_spc_limit; /* Maximum space limit [static] */ - qsize_t dqi_max_ino_limit; /* Maximum inode limit [static] */ - void *dqi_priv; -}; - struct super_block; /* Mask for flags passed to userspace */ @@ -517,14 +494,6 @@ static inline void quota_send_warning(struct kqid qid, dev_t dev, } #endif /* CONFIG_QUOTA_NETLINK_INTERFACE */ -struct quota_info { - unsigned int flags; /* Flags for diskquotas on this device */ - struct rw_semaphore dqio_sem; /* Lock quota file while I/O in progress */ - struct inode *files[MAXQUOTAS]; /* inodes of quotafiles */ - struct mem_dqinfo info[MAXQUOTAS]; /* Information for each quota type */ - const struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */ -}; - int register_quota_format(struct quota_format_type *fmt); void unregister_quota_format(struct quota_format_type *fmt); diff --git a/include/linux/quota_types.h b/include/linux/quota_types.h new file mode 100644 index 000000000000..7f52ee2604bb --- /dev/null +++ b/include/linux/quota_types.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 1982, 1986 Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Robert Elz at The University of Melbourne. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#ifndef _LINUX_QUOTA_TYPES_ +#define _LINUX_QUOTA_TYPES_ + +#include +#include +#include + +typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */ +typedef long long qsize_t; /* Type in which we store sizes */ + +/* + * Data for one quotafile kept in memory + */ +struct quota_format_type; + +struct mem_dqinfo { + struct quota_format_type *dqi_format; + int dqi_fmt_id; /* Id of the dqi_format - used when turning + * quotas on after remount RW */ + struct list_head dqi_dirty_list; /* List of dirty dquots [dq_list_lock] */ + unsigned long dqi_flags; /* DFQ_ flags [dq_data_lock] */ + unsigned int dqi_bgrace; /* Space grace time [dq_data_lock] */ + unsigned int dqi_igrace; /* Inode grace time [dq_data_lock] */ + qsize_t dqi_max_spc_limit; /* Maximum space limit [static] */ + qsize_t dqi_max_ino_limit; /* Maximum inode limit [static] */ + void *dqi_priv; +}; + +struct quota_info { + unsigned int flags; /* Flags for diskquotas on this device */ + struct rw_semaphore dqio_sem; /* Lock quota file while I/O in progress */ + struct inode *files[MAXQUOTAS]; /* inodes of quotafiles */ + struct mem_dqinfo info[MAXQUOTAS]; /* Information for each quota type */ + const struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */ +}; + +#endif /* _LINUX_QUOTA_TYPES_ */