Commit 307ae18a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara
Browse files

quota: drop remount argument to ->quota_on and ->quota_off 



Remount handling has fully moved into the filesystem, so all this is
superflous now.

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

fs/ext3/super.c

+3 −6
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static int ext3_release_dquot(struct dquot *dquot); 
static int ext3_mark_dquot_dirty(struct dquot *dquot);

static int ext3_write_info(struct super_block *sb, int type);

static int ext3_quota_on(struct super_block *sb, int type, int format_id,

				char *path, int remount);

				char *path);

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

static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,

			       size_t len, loff_t off);
@@ -1529,7 +1529,7 @@ static void ext3_orphan_cleanup (struct super_block * sb, 
	/* Turn quotas off */

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

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

			vfs_quota_off(sb, i, 0);

			vfs_quota_off(sb, i);

	}

#endif

	sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -2870,16 +2870,13 @@ static int ext3_quota_on_mount(struct super_block *sb, int type) 
 * Standard function to be called on quota_on

 */

static int ext3_quota_on(struct super_block *sb, int type, int format_id,

			 char *name, int remount)

			 char *name)

{

	int err;

	struct path path;



	if (!test_opt(sb, QUOTA))

		return -EINVAL;

	/* When remounting, no checks are needed and in fact, name is NULL */

	if (remount)

		return vfs_quota_on(sb, type, format_id, name, remount);



	err = kern_path(name, LOOKUP_FOLLOW, &path);

	if (err)

fs/ext4/super.c

+3 −6
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ static int ext4_release_dquot(struct dquot *dquot); 
static int ext4_mark_dquot_dirty(struct dquot *dquot);

static int ext4_write_info(struct super_block *sb, int type);

static int ext4_quota_on(struct super_block *sb, int type, int format_id,

				char *path, int remount);

				char *path);

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

static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,

			       size_t len, loff_t off);
@@ -2053,7 +2053,7 @@ static void ext4_orphan_cleanup(struct super_block *sb, 
	/* Turn quotas off */

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

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

			vfs_quota_off(sb, i, 0);

			vfs_quota_off(sb, i);

	}

#endif

	sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -3924,16 +3924,13 @@ static int ext4_quota_on_mount(struct super_block *sb, int type) 
 * Standard function to be called on quota_on

 */

static int ext4_quota_on(struct super_block *sb, int type, int format_id,

			 char *name, int remount)

			 char *name)

{

	int err;

	struct path path;



	if (!test_opt(sb, QUOTA))

		return -EINVAL;

	/* When remounting, no checks are needed and in fact, name is NULL */

	if (remount)

		return vfs_quota_on(sb, type, format_id, name, remount);



	err = kern_path(name, LOOKUP_FOLLOW, &path);

	if (err)

fs/ocfs2/super.c

+2 −8
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb) 


/* Handle quota on quotactl */

static int ocfs2_quota_on(struct super_block *sb, int type, int format_id,

			  char *path, int remount)

			  char *path)

{

	unsigned int feature[MAXQUOTAS] = { OCFS2_FEATURE_RO_COMPAT_USRQUOTA,

					     OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
@@ -972,19 +972,13 @@ static int ocfs2_quota_on(struct super_block *sb, int type, int format_id, 
	if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))

		return -EINVAL;



	if (remount)

		return 0;	/* Just ignore it has been handled in

				 * ocfs2_remount() */

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

				    format_id, DQUOT_LIMITS_ENABLED);

}



/* Handle quota off quotactl */

static int ocfs2_quota_off(struct super_block *sb, int type, int remount)

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

{

	if (remount)

		return 0;	/* Ignore now and handle later in

				 * ocfs2_remount() */

	return dquot_disable(sb, type, DQUOT_LIMITS_ENABLED);

}

fs/quota/dquot.c

+2 −6
Original line number Diff line number Diff line
@@ -1997,9 +1997,8 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) 
}

EXPORT_SYMBOL(dquot_disable);



int vfs_quota_off(struct super_block *sb, int type, int remount)

int vfs_quota_off(struct super_block *sb, int type)

{

	BUG_ON(remount);

	return dquot_disable(sb, type,

			     DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);

}
@@ -2175,14 +2174,11 @@ int vfs_quota_on_path(struct super_block *sb, int type, int format_id, 
}

EXPORT_SYMBOL(vfs_quota_on_path);



int vfs_quota_on(struct super_block *sb, int type, int format_id, char *name,

		 int remount)

int vfs_quota_on(struct super_block *sb, int type, int format_id, char *name)

{

	struct path path;

	int error;



	BUG_ON(remount);



	error = kern_path(name, LOOKUP_FOLLOW, &path);

	if (!error) {

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

fs/quota/quota.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int quota_quotaon(struct super_block *sb, int type, int cmd, qid_t id, 
	if (IS_ERR(pathname))

		return PTR_ERR(pathname);

	if (sb->s_qcop->quota_on)

		ret = sb->s_qcop->quota_on(sb, type, id, pathname, 0);

		ret = sb->s_qcop->quota_on(sb, type, id, pathname);

	putname(pathname);

	return ret;

}
@@ -260,7 +260,7 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id, 
	case Q_QUOTAOFF:

		if (!sb->s_qcop->quota_off)

			return -ENOSYS;

		return sb->s_qcop->quota_off(sb, type, 0);

		return sb->s_qcop->quota_off(sb, type);

	case Q_GETFMT:

		return quota_getfmt(sb, type, addr);

	case Q_GETINFO: