Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fd83a4f authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

quota: ext3: make ext3 handle quotaon on remount 



Update ext3 handle quotaon on remount RW.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ff5af83

fs/ext3/super.c

+10 −9
Original line number Original line Diff line number Diff line
@@ -685,7 +685,8 @@ static int ext3_acquire_dquot(struct dquot *dquot); 
static int ext3_release_dquot(struct dquot *dquot);

static int ext3_release_dquot(struct dquot *dquot);

static int ext3_mark_dquot_dirty(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_write_info(struct super_block *sb, int type);

static int ext3_quota_on(struct super_block *sb, int type, int format_id, char *path);

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

				char *path, int remount);

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

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,

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

			       size_t len, loff_t off);

			       size_t len, loff_t off);
@@ -1415,7 +1416,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);

			vfs_quota_off(sb, i, 0);

	}

	}

#endif

#endif

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

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

 * Standard function to be called on quota_on

 */

 */

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

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

			 char *path)

			 char *path, int remount)

{

{

	int err;

	int err;

	struct nameidata nd;

	struct nameidata nd;





	if (!test_opt(sb, QUOTA))

	if (!test_opt(sb, QUOTA))

		return -EINVAL;

		return -EINVAL;

	/* Not journalling quota? */

	/* Not journalling quota or remount? */

	if (!EXT3_SB(sb)->s_qf_names[USRQUOTA] &&

	if ((!EXT3_SB(sb)->s_qf_names[USRQUOTA] &&

	    !EXT3_SB(sb)->s_qf_names[GRPQUOTA])

	    !EXT3_SB(sb)->s_qf_names[GRPQUOTA]) || remount)

		return vfs_quota_on(sb, type, format_id, path);

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

	err = path_lookup(path, LOOKUP_FOLLOW, &nd);

	err = path_lookup(path, LOOKUP_FOLLOW, &nd);

	if (err)

	if (err)

		return err;

		return err;
@@ -2762,13 +2763,13 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id, 
		path_put(&nd.path);

		path_put(&nd.path);

		return -EXDEV;

		return -EXDEV;

	}

	}

	/* Quotafile not of fs root? */

	/* Quotafile not in fs root? */

	if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)

	if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)

		printk(KERN_WARNING

		printk(KERN_WARNING

			"EXT3-fs: Quota file not on filesystem root. "

			"EXT3-fs: Quota file not on filesystem root. "

			"Journalled quota will not work.\n");

			"Journalled quota will not work.\n");

	path_put(&nd.path);

	path_put(&nd.path);

	return vfs_quota_on(sb, type, format_id, path);

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

}

}





/* Read data from quotafile - avoid pagecache and such because we cannot afford

/* Read data from quotafile - avoid pagecache and such because we cannot afford