From b1906dff6d49ea750b413c1a7ef9f400535a9840 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Wed, 21 Dec 2011 17:35:34 +0100
Subject: [PATCH] --- yaml --- r: 281454 b: refs/heads/master c:
 a06d789b424190e9f59da391681f908486db2554 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/super.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d1e90498e163..6ee36492ee5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fef2e9f3301934773e4f1b3cc5c7bffb119346b8
+refs/heads/master: a06d789b424190e9f59da391681f908486db2554
diff --git a/trunk/fs/reiserfs/super.c b/trunk/fs/reiserfs/super.c
index 14363b96b6af..f9eaa4a4f5f3 100644
--- a/trunk/fs/reiserfs/super.c
+++ b/trunk/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