Commit 287a8095 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara
Browse files

quota: rename default quotactl methods to dquot_ 



Follow the dquot_* style used elsewhere in dquot.c.

[Jan Kara: Fixed up missing conversion of ext2]

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 123e9caf

fs/ext2/super.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1068,7 +1068,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 




#ifdef CONFIG_QUOTA

#ifdef CONFIG_QUOTA

	sb->dq_op = &dquot_operations;

	sb->dq_op = &dquot_operations;

	sb->s_qcop = &vfs_quotactl_ops;

	sb->s_qcop = &dquot_quotactl_ops;

#endif

#endif





	root = ext2_iget(sb, EXT2_ROOT_INO);

	root = ext2_iget(sb, EXT2_ROOT_INO);

fs/ext3/super.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -769,12 +769,12 @@ static const struct dquot_operations ext3_quota_operations = { 




static const struct quotactl_ops ext3_qctl_operations = {

static const struct quotactl_ops ext3_qctl_operations = {

	.quota_on	= ext3_quota_on,

	.quota_on	= ext3_quota_on,

	.quota_off	= vfs_quota_off,

	.quota_off	= dquot_quota_off,

	.quota_sync	= vfs_quota_sync,

	.quota_sync	= dquot_quota_sync,

	.get_info	= vfs_get_dqinfo,

	.get_info	= dquot_get_dqinfo,

	.set_info	= vfs_set_dqinfo,

	.set_info	= dquot_set_dqinfo,

	.get_dqblk	= vfs_get_dqblk,

	.get_dqblk	= dquot_get_dqblk,

	.set_dqblk	= vfs_set_dqblk

	.set_dqblk	= dquot_set_dqblk

};

};

#endif

#endif
@@ -1529,7 +1529,7 @@ static void ext3_orphan_cleanup (struct super_block * sb, 
	/* Turn quotas off */

	/* Turn quotas off */

	for (i = 0; i < MAXQUOTAS; i++) {

	for (i = 0; i < MAXQUOTAS; i++) {

		if (sb_dqopt(sb)->files[i])

		if (sb_dqopt(sb)->files[i])

			vfs_quota_off(sb, i);

			dquot_quota_off(sb, i);

	}

	}

#endif

#endif

	sb->s_flags = s_flags; /* Restore MS_RDONLY status */

	sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -2862,7 +2862,7 @@ static int ext3_write_info(struct super_block *sb, int type) 
 */

 */

static int ext3_quota_on_mount(struct super_block *sb, int type)

static int ext3_quota_on_mount(struct super_block *sb, int type)

{

{

	return vfs_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],

	return dquot_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],

					EXT3_SB(sb)->s_jquota_fmt, type);

					EXT3_SB(sb)->s_jquota_fmt, type);

}

}
@@ -2914,7 +2914,7 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id, 
		}

		}

	}

	}





	err = vfs_quota_on_path(sb, type, format_id, &path);

	err = dquot_quota_on_path(sb, type, format_id, &path);

	path_put(&path);

	path_put(&path);

	return err;

	return err;

}

}

fs/ext4/super.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -1083,12 +1083,12 @@ static const struct dquot_operations ext4_quota_operations = { 




static const struct quotactl_ops ext4_qctl_operations = {

static const struct quotactl_ops ext4_qctl_operations = {

	.quota_on	= ext4_quota_on,

	.quota_on	= ext4_quota_on,

	.quota_off	= vfs_quota_off,

	.quota_off	= dquot_quota_off,

	.quota_sync	= vfs_quota_sync,

	.quota_sync	= dquot_quota_sync,

	.get_info	= vfs_get_dqinfo,

	.get_info	= dquot_get_dqinfo,

	.set_info	= vfs_set_dqinfo,

	.set_info	= dquot_set_dqinfo,

	.get_dqblk	= vfs_get_dqblk,

	.get_dqblk	= dquot_get_dqblk,

	.set_dqblk	= vfs_set_dqblk

	.set_dqblk	= dquot_set_dqblk

};

};

#endif

#endif
@@ -2053,7 +2053,7 @@ static void ext4_orphan_cleanup(struct super_block *sb, 
	/* Turn quotas off */

	/* Turn quotas off */

	for (i = 0; i < MAXQUOTAS; i++) {

	for (i = 0; i < MAXQUOTAS; i++) {

		if (sb_dqopt(sb)->files[i])

		if (sb_dqopt(sb)->files[i])

			vfs_quota_off(sb, i);

			dquot_quota_off(sb, i);

	}

	}

#endif

#endif

	sb->s_flags = s_flags; /* Restore MS_RDONLY status */

	sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -3916,7 +3916,7 @@ static int ext4_write_info(struct super_block *sb, int type) 
 */

 */

static int ext4_quota_on_mount(struct super_block *sb, int type)

static int ext4_quota_on_mount(struct super_block *sb, int type)

{

{

	return vfs_quota_on_mount(sb, EXT4_SB(sb)->s_qf_names[type],

	return dquot_quota_on_mount(sb, EXT4_SB(sb)->s_qf_names[type],

					EXT4_SB(sb)->s_jquota_fmt, type);

					EXT4_SB(sb)->s_jquota_fmt, type);

}

}
@@ -3969,7 +3969,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id, 
		}

		}

	}

	}





	err = vfs_quota_on_path(sb, type, format_id, &path);

	err = dquot_quota_on_path(sb, type, format_id, &path);

	path_put(&path);

	path_put(&path);

	return err;

	return err;

}

}

fs/jfs/super.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -483,7 +483,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_export_op = &jfs_export_operations;

	sb->s_export_op = &jfs_export_operations;

#ifdef CONFIG_QUOTA

#ifdef CONFIG_QUOTA

	sb->dq_op = &dquot_operations;

	sb->dq_op = &dquot_operations;

	sb->s_qcop = &vfs_quotactl_ops;

	sb->s_qcop = &dquot_quotactl_ops;

#endif

#endif





	/*

	/*

fs/ocfs2/super.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -918,7 +918,7 @@ static int ocfs2_enable_quotas(struct ocfs2_super *osb) 
			status = -ENOENT;

			status = -ENOENT;

			goto out_quota_off;

			goto out_quota_off;

		}

		}

		status = vfs_quota_enable(inode[type], type, QFMT_OCFS2,

		status = dquot_enable(inode[type], type, QFMT_OCFS2,

				      DQUOT_USAGE_ENABLED);

				      DQUOT_USAGE_ENABLED);

		if (status < 0)

		if (status < 0)

			goto out_quota_off;

			goto out_quota_off;
@@ -972,7 +972,7 @@ static int ocfs2_quota_on(struct super_block *sb, int type, int format_id, 
	if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))

	if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))

		return -EINVAL;

		return -EINVAL;





	return vfs_quota_enable(sb_dqopt(sb)->files[type], type,

	return dquot_enable(sb_dqopt(sb)->files[type], type,

			    format_id, DQUOT_LIMITS_ENABLED);

			    format_id, DQUOT_LIMITS_ENABLED);

}

}
@@ -985,11 +985,11 @@ static int ocfs2_quota_off(struct super_block *sb, int type) 
static const struct quotactl_ops ocfs2_quotactl_ops = {

static const struct quotactl_ops ocfs2_quotactl_ops = {

	.quota_on	= ocfs2_quota_on,

	.quota_on	= ocfs2_quota_on,

	.quota_off	= ocfs2_quota_off,

	.quota_off	= ocfs2_quota_off,

	.quota_sync	= vfs_quota_sync,

	.quota_sync	= dquot_quota_sync,

	.get_info	= vfs_get_dqinfo,

	.get_info	= dquot_get_dqinfo,

	.set_info	= vfs_set_dqinfo,

	.set_info	= dquot_set_dqinfo,

	.get_dqblk	= vfs_get_dqblk,

	.get_dqblk	= dquot_get_dqblk,

	.set_dqblk	= vfs_set_dqblk,

	.set_dqblk	= dquot_set_dqblk,

};

};





static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)

static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)