[PATCH 01/10] quota: Make inode optional

Jan Kara jack at suse.cz
Fri Nov 1 11:07:21 PDT 2019


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 at 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 at suse.com>
SUSE Labs, CR



More information about the linux-mtd mailing list