aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2011-12-21 17:35:34 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-12 11:29:30 -0800
commite75c11aceb7c8717241719e531c9adece8111987 (patch)
tree15d553f70f618b446bedfa4dc0234bf9c7ab7f17
parent88e02818005ddaf5d584f58586c38f18168cecf3 (diff)
downloadvexpress-lsk-e75c11aceb7c8717241719e531c9adece8111987.tar.gz
reiserfs: Fix quota mount option parsing
commit a06d789b424190e9f59da391681f908486db2554 upstream. When jqfmt mount option is not specified on remount, we mistakenly clear s_jquota_fmt value stored in superblock. Fix the problem. CC: reiserfs-devel@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/reiserfs/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 14363b96b6a..f9eaa4a4f5f 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1164,7 +1164,8 @@ static void handle_quota_files(struct super_block *s, char **qf_names,
kfree(REISERFS_SB(s)->s_qf_names[i]);
REISERFS_SB(s)->s_qf_names[i] = qf_names[i];
}
- REISERFS_SB(s)->s_jquota_fmt = *qfmt;
+ if (*qfmt)
+ REISERFS_SB(s)->s_jquota_fmt = *qfmt;
}
#endif