[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.1 / 0023-reiserfs-Fix-quota-mount-option-parsing.patch
1 From 755af2779e6b0a7bb925b7c362e69f959995e6ca Mon Sep 17 00:00:00 2001
2 From: Jan Kara <jack@suse.cz>
3 Date: Wed, 21 Dec 2011 17:35:34 +0100
4 Subject: [PATCH 23/49] reiserfs: Fix quota mount option parsing
6 commit a06d789b424190e9f59da391681f908486db2554 upstream.
8 When jqfmt mount option is not specified on remount, we mistakenly clear
9 s_jquota_fmt value stored in superblock. Fix the problem.
11 CC: reiserfs-devel@vger.kernel.org
12 Signed-off-by: Jan Kara <jack@suse.cz>
13 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 ---
15 fs/reiserfs/super.c | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
18 diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
19 index 14363b9..f9eaa4a 100644
20 --- a/fs/reiserfs/super.c
21 +++ b/fs/reiserfs/super.c
22 @@ -1164,7 +1164,8 @@ static void handle_quota_files(struct super_block *s, char **qf_names,
23 kfree(REISERFS_SB(s)->s_qf_names[i]);
24 REISERFS_SB(s)->s_qf_names[i] = qf_names[i];
25 }
26 - REISERFS_SB(s)->s_jquota_fmt = *qfmt;
27 + if (*qfmt)
28 + REISERFS_SB(s)->s_jquota_fmt = *qfmt;
29 }
30 #endif
32 --
33 1.7.9.4