Commit f177ee08 authored by Roman Anufriev's avatar Roman Anufriev Committed by Theodore Ts'o
Browse files

ext4: add helpers for checking whether quota can be enabled/is journalled 

Right now, there are several places, where we check whether fs is
capable of enabling quota or if quota is journalled with quite long
and non-self-descriptive condition statements.

This patch wraps these statements into helpers for better readability
and easier usage.

Link: https://lore.kernel.org/r/1603336860-16153-1-git-send-email-dotdot@yandex-team.ru


Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarRoman Anufriev <dotdot@yandex-team.ru>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent face525e

fs/ext4/ext4.h

+15 −0
Original line number Diff line number Diff line
@@ -3361,6 +3361,21 @@ static inline void ext4_unlock_group(struct super_block *sb, 
	spin_unlock(ext4_group_lock_ptr(sb, group));

}



#ifdef CONFIG_QUOTA

static inline bool ext4_quota_capable(struct super_block *sb)

{

	return (test_opt(sb, QUOTA) || ext4_has_feature_quota(sb));

}



static inline bool ext4_is_quota_journalled(struct super_block *sb)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	return (ext4_has_feature_quota(sb) ||

		sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]);

}

#endif



/*

 * Block validity checking

 */

fs/ext4/ext4_jbd2.h

+3 −6
Original line number Diff line number Diff line
@@ -86,17 +86,14 @@ 
#ifdef CONFIG_QUOTA

/* Amount of blocks needed for quota update - we know that the structure was

 * allocated so we need to update only data block */

#define EXT4_QUOTA_TRANS_BLOCKS(sb) ((test_opt(sb, QUOTA) ||\

		ext4_has_feature_quota(sb)) ? 1 : 0)

#define EXT4_QUOTA_TRANS_BLOCKS(sb) ((ext4_quota_capable(sb)) ? 1 : 0)

/* Amount of blocks needed for quota insert/delete - we do some block writes

 * but inode, sb and group updates are done only once */

#define EXT4_QUOTA_INIT_BLOCKS(sb) ((test_opt(sb, QUOTA) ||\

		ext4_has_feature_quota(sb)) ?\

#define EXT4_QUOTA_INIT_BLOCKS(sb) ((ext4_quota_capable(sb)) ?\

		(DQUOT_INIT_ALLOC*(EXT4_SINGLEDATA_TRANS_BLOCKS(sb)-3)\

		 +3+DQUOT_INIT_REWRITE) : 0)



#define EXT4_QUOTA_DEL_BLOCKS(sb) ((test_opt(sb, QUOTA) ||\

		ext4_has_feature_quota(sb)) ?\

#define EXT4_QUOTA_DEL_BLOCKS(sb) ((ext4_quota_capable(sb)) ?\

		(DQUOT_DEL_ALLOC*(EXT4_SINGLEDATA_TRANS_BLOCKS(sb)-3)\

		 +3+DQUOT_DEL_REWRITE) : 0)

#else

fs/ext4/super.c

+1 −4
Original line number Diff line number Diff line
@@ -6210,11 +6210,8 @@ static int ext4_release_dquot(struct dquot *dquot) 
static int ext4_mark_dquot_dirty(struct dquot *dquot)

{

	struct super_block *sb = dquot->dq_sb;

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	/* Are we journaling quotas? */

	if (ext4_has_feature_quota(sb) ||

	    sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {

	if (ext4_is_quota_journalled(sb)) {

		dquot_mark_dquot_dirty(dquot);

		return ext4_write_dquot(dquot);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE