aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-05-19 07:16:43 -0400
committerJan Kara <jack@suse.cz>2010-05-24 08:09:12 -0400
commit307ae18a56e5b706056a2050d52e8cc01b5171c0 (patch)
treec4efc57bb8f0fd1d2aa9e416d81c0c7ba87aaf22 /fs/reiserfs
parente0ccfd959cd8907bcb66cc2042e0f4fd7fcbff2b (diff)
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: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/super.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 08879af0af0d..fa46abd0d958 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -305,7 +305,7 @@ static int finish_unfinished(struct super_block *s)
305 /* Turn quotas off */ 305 /* Turn quotas off */
306 for (i = 0; i < MAXQUOTAS; i++) { 306 for (i = 0; i < MAXQUOTAS; i++) {
307 if (sb_dqopt(s)->files[i]) 307 if (sb_dqopt(s)->files[i])
308 vfs_quota_off(s, i, 0); 308 vfs_quota_off(s, i);
309 } 309 }
310 if (ms_active_set) 310 if (ms_active_set)
311 /* Restore the flag back */ 311 /* Restore the flag back */
@@ -622,7 +622,7 @@ static int reiserfs_acquire_dquot(struct dquot *);
622static int reiserfs_release_dquot(struct dquot *); 622static int reiserfs_release_dquot(struct dquot *);
623static int reiserfs_mark_dquot_dirty(struct dquot *); 623static int reiserfs_mark_dquot_dirty(struct dquot *);
624static int reiserfs_write_info(struct super_block *, int); 624static int reiserfs_write_info(struct super_block *, int);
625static int reiserfs_quota_on(struct super_block *, int, int, char *, int); 625static int reiserfs_quota_on(struct super_block *, int, int, char *);
626 626
627static const struct dquot_operations reiserfs_quota_operations = { 627static const struct dquot_operations reiserfs_quota_operations = {
628 .write_dquot = reiserfs_write_dquot, 628 .write_dquot = reiserfs_write_dquot,
@@ -2038,7 +2038,7 @@ static int reiserfs_quota_on_mount(struct super_block *sb, int type)
2038 * Standard function to be called on quota_on 2038 * Standard function to be called on quota_on
2039 */ 2039 */
2040static int reiserfs_quota_on(struct super_block *sb, int type, int format_id, 2040static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
2041 char *name, int remount) 2041 char *name)
2042{ 2042{
2043 int err; 2043 int err;
2044 struct path path; 2044 struct path path;
@@ -2047,9 +2047,7 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
2047 2047
2048 if (!(REISERFS_SB(sb)->s_mount_opt & (1 << REISERFS_QUOTA))) 2048 if (!(REISERFS_SB(sb)->s_mount_opt & (1 << REISERFS_QUOTA)))
2049 return -EINVAL; 2049 return -EINVAL;
2050 /* No more checks needed? Path and format_id are bogus anyway... */ 2050
2051 if (remount)
2052 return vfs_quota_on(sb, type, format_id, name, 1);
2053 err = kern_path(name, LOOKUP_FOLLOW, &path); 2051 err = kern_path(name, LOOKUP_FOLLOW, &path);
2054 if (err) 2052 if (err)
2055 return err; 2053 return err;