From: Jan Kara <jack@suse.cz>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: linux-fsdevel@vger.kernel.org,
Richard Weinberger <richard@nod.at>,
linux-mtd@lists.infradead.org, kernel@pengutronix.de,
Jan Kara <jack@suse.com>
Subject: Re: [PATCH 01/10] quota: Make inode optional
Date: Fri, 1 Nov 2019 19:07:21 +0100 [thread overview]
Message-ID: <20191101180721.GB23441@quack2.suse.cz> (raw)
In-Reply-To: <20191030152702.14269-2-s.hauer@pengutronix.de>
On Wed 30-10-19 16:26:53, Sascha Hauer wrote:
> To add support for filesystems which do not store quota informations in
> an inode make the inode optional.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Umm, I don't quite like how the first three patches work out. I have
somewhat refactored quota code to make things nicer and allow enabling of
quotas only with superblock at hand. I'll post the patches once they pass
some testing early next week.
Honza
> ---
> fs/quota/dquot.c | 33 +++++++++++++++++++++------------
> 1 file changed, 21 insertions(+), 12 deletions(-)
>
> diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
> index 6e826b454082..59f31735fe79 100644
> --- a/fs/quota/dquot.c
> +++ b/fs/quota/dquot.c
> @@ -2313,11 +2313,11 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
>
> if (!fmt)
> return -ESRCH;
> - if (!S_ISREG(inode->i_mode)) {
> + if (inode && !S_ISREG(inode->i_mode)) {
> error = -EACCES;
> goto out_fmt;
> }
> - if (IS_RDONLY(inode)) {
> + if (inode && IS_RDONLY(inode)) {
> error = -EROFS;
> goto out_fmt;
> }
> @@ -2352,7 +2352,7 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
> invalidate_bdev(sb->s_bdev);
> }
>
> - if (!(dqopt->flags & DQUOT_QUOTA_SYS_FILE)) {
> + if (inode && !(dqopt->flags & DQUOT_QUOTA_SYS_FILE)) {
> /* We don't want quota and atime on quota files (deadlocks
> * possible) Also nobody should write to the file - we use
> * special IO operations which ignore the immutable bit. */
> @@ -2367,9 +2367,13 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
> }
>
> error = -EIO;
> - dqopt->files[type] = igrab(inode);
> - if (!dqopt->files[type])
> - goto out_file_flags;
> +
> + if (inode) {
> + dqopt->files[type] = igrab(inode);
> + if (!dqopt->files[type])
> + goto out_file_flags;
> + }
> +
> error = -EINVAL;
> if (!fmt->qf_ops->check_quota_file(sb, type))
> goto out_file_init;
> @@ -2397,11 +2401,14 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
> return error;
> out_file_init:
> dqopt->files[type] = NULL;
> - iput(inode);
> + if (inode)
> + iput(inode);
> out_file_flags:
> - inode_lock(inode);
> - inode->i_flags &= ~S_NOQUOTA;
> - inode_unlock(inode);
> + if (inode) {
> + inode_lock(inode);
> + inode->i_flags &= ~S_NOQUOTA;
> + inode_unlock(inode);
> + }
> out_fmt:
> put_quota_format(fmt);
>
> @@ -2800,8 +2807,10 @@ int dquot_get_state(struct super_block *sb, struct qc_state *state)
> tstate->flags |= QCI_LIMITS_ENFORCED;
> tstate->spc_timelimit = mi->dqi_bgrace;
> tstate->ino_timelimit = mi->dqi_igrace;
> - tstate->ino = dqopt->files[type]->i_ino;
> - tstate->blocks = dqopt->files[type]->i_blocks;
> + if (dqopt->files[type]) {
> + tstate->ino = dqopt->files[type]->i_ino;
> + tstate->blocks = dqopt->files[type]->i_blocks;
> + }
> tstate->nextents = 1; /* We don't know... */
> spin_unlock(&dq_data_lock);
> }
> --
> 2.24.0.rc1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-11-01 18:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 15:26 [PATCH v2 00/10] Add quota support to UBIFS Sascha Hauer
2019-10-30 15:26 ` [PATCH 01/10] quota: Make inode optional Sascha Hauer
2019-11-01 18:07 ` Jan Kara [this message]
2019-11-04 7:48 ` Sascha Hauer
2019-10-30 15:26 ` [PATCH 02/10] quota: Pass sb to vfs_load_quota_inode() Sascha Hauer
2019-10-30 15:26 ` [PATCH 03/10] quota: Introduce dquot_enable_sb() Sascha Hauer
2019-10-30 15:26 ` [PATCH 04/10] quota: Allow to pass mount path to quotactl Sascha Hauer
2019-11-01 16:07 ` Jan Kara
2019-11-11 10:08 ` Sascha Hauer
2019-11-11 11:05 ` Jan Kara
2019-11-11 11:14 ` Sascha Hauer
2019-10-30 15:26 ` [PATCH 05/10] ubifs: move checks and preparation into setflags() Sascha Hauer
2019-10-30 15:26 ` [PATCH 06/10] ubifs: Add support for FS_IOC_FS[SG]ETXATTR ioctls Sascha Hauer
2019-10-30 15:26 ` [PATCH 07/10] ubifs: do not ubifs_inode() on potentially NULL pointer Sascha Hauer
2019-10-30 15:27 ` [PATCH 08/10] ubifs: Add support for project id Sascha Hauer
2019-10-30 15:27 ` [PATCH 09/10] ubifs: export get_znode Sascha Hauer
2019-10-30 15:27 ` [PATCH 10/10] ubifs: Add quota support Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191101180721.GB23441@quack2.suse.cz \
--to=jack@suse.cz \
--cc=jack@suse.com \
--cc=kernel@pengutronix.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).