From 00960bccd89fcba80e8c2f2bcc94d5bb2cd1ab95 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Wed, 28 Mar 2012 19:09:29 +0400
Subject: [PATCH] --- yaml --- r: 309791 b: refs/heads/master c:
 f2c7ea10f901b7648eb61f1da7243588351f1dac h: refs/heads/master i:   309789:
 218f0a3195e53c147aac27017326edb90e16c77f   309787:
 03ae01ebdfdb22afa20fb0930243701c57797079   309783:
 a7920d8fd644c2fd7ce3438ba743aa6c2b072d88   309775:
 c34005c8786e3bd1d40bf0b9772e02c942189c75   309759:
 f82b8e13acc675b5e799b8eebd79350747372d1e v: v3

---
 [refs]                 |  2 +-
 trunk/fs/nfsd/export.c | 18 +++++++++++-------
 trunk/fs/nfsd/nfsctl.c | 11 ++++++++++-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0ab4d5261ed7..7bd8c39f9803 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a09581f29434ae67f8fc6ae487e4f30a7f0d019f
+refs/heads/master: f2c7ea10f901b7648eb61f1da7243588351f1dac
diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c
index c20a405b5862..149532023778 100644
--- a/trunk/fs/nfsd/export.c
+++ b/trunk/fs/nfsd/export.c
@@ -1029,13 +1029,14 @@ exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)
 /* Iterator */
 
 static void *e_start(struct seq_file *m, loff_t *pos)
-	__acquires(svc_export_cache.hash_lock)
+	__acquires(((struct cache_detail *)m->private)->hash_lock)
 {
 	loff_t n = *pos;
 	unsigned hash, export;
 	struct cache_head *ch;
-	
-	read_lock(&svc_export_cache.hash_lock);
+	struct cache_detail *cd = m->private;
+
+	read_lock(&cd->hash_lock);
 	if (!n--)
 		return SEQ_START_TOKEN;
 	hash = n >> 32;
@@ -1082,9 +1083,11 @@ static void *e_next(struct seq_file *m, void *p, loff_t *pos)
 }
 
 static void e_stop(struct seq_file *m, void *p)
-	__releases(svc_export_cache.hash_lock)
+	__releases(((struct cache_detail *)m->private)->hash_lock)
 {
-	read_unlock(&svc_export_cache.hash_lock);
+	struct cache_detail *cd = m->private;
+
+	read_unlock(&cd->hash_lock);
 }
 
 static struct flags {
@@ -1195,6 +1198,7 @@ static int e_show(struct seq_file *m, void *p)
 {
 	struct cache_head *cp = p;
 	struct svc_export *exp = container_of(cp, struct svc_export, h);
+	struct cache_detail *cd = m->private;
 
 	if (p == SEQ_START_TOKEN) {
 		seq_puts(m, "# Version 1.1\n");
@@ -1203,10 +1207,10 @@ static int e_show(struct seq_file *m, void *p)
 	}
 
 	cache_get(&exp->h);
-	if (cache_check(&svc_export_cache, &exp->h, NULL))
+	if (cache_check(cd, &exp->h, NULL))
 		return 0;
 	exp_put(exp);
-	return svc_export_show(m, &svc_export_cache, cp);
+	return svc_export_show(m, cd, cp);
 }
 
 const struct seq_operations nfs_exports_op = {
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 2c53be6d3579..ae19293e68df 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/fs/nfsd/nfsctl.c
@@ -127,7 +127,16 @@ static const struct file_operations transaction_ops = {
 
 static int exports_open(struct inode *inode, struct file *file)
 {
-	return seq_open(file, &nfs_exports_op);
+	int err;
+	struct seq_file *seq;
+
+	err = seq_open(file, &nfs_exports_op);
+	if (err)
+		return err;
+
+	seq = file->private_data;
+	seq->private = &svc_export_cache;
+	return 0;
 }
 
 static const struct file_operations exports_operations = {