diff options
author | Jan Kara <jack@suse.cz> | 2011-12-21 17:35:34 +0100 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2012-01-09 13:52:09 +0100 |
commit | a06d789b424190e9f59da391681f908486db2554 (patch) | |
tree | 540274351d80680a8fab0325c440dab52170aaae | |
parent | fef2e9f3301934773e4f1b3cc5c7bffb119346b8 (diff) | |
download | linux-3.10-a06d789b424190e9f59da391681f908486db2554.tar.gz linux-3.10-a06d789b424190e9f59da391681f908486db2554.tar.bz2 linux-3.10-a06d789b424190e9f59da391681f908486db2554.zip |
reiserfs: Fix quota mount option parsing
When jqfmt mount option is not specified on remount, we mistakenly clear
s_jquota_fmt value stored in superblock. Fix the problem.
CC: stable@kernel.org
CC: reiserfs-devel@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r-- | fs/reiserfs/super.c | 3 |
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 |