diff options
| author | Jan Kara <jack@suse.cz> | 2011-12-21 17:35:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-12 11:35:05 -0800 |
| commit | dcc4f0ce22c88840b2c490e962dfbd84cb003941 (patch) | |
| tree | 93b762499df8e284936d93b6628933aa6418d70d /fs | |
| parent | 2431496fbdd142ccc83138d94f3f510a36ce9270 (diff) | |
| download | kernel_samsung_aries-dcc4f0ce22c88840b2c490e962dfbd84cb003941.zip kernel_samsung_aries-dcc4f0ce22c88840b2c490e962dfbd84cb003941.tar.gz kernel_samsung_aries-dcc4f0ce22c88840b2c490e962dfbd84cb003941.tar.bz2 | |
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>
Diffstat (limited to 'fs')
| -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 aa91089..a19a9f5 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 |