From 459ad47ec6dc931f6a8570aadfdab7ec59a54b58 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 13 Aug 2010 15:53:49 +0200
Subject: [PATCH] --- yaml --- r: 210039 b: refs/heads/master c:
 f6360efb83cd6dd1476cd758834c8277508c1f15 h: refs/heads/master i:   210037:
 725d183845b869ac6609df8639b919447509d7fa   210035:
 1cbf0221e22dbc378e7cae2faad0aaca725c0f1b   210031:
 ad8f4289cb576b76b37abb7225dca9eff644cf5c v: v3

---
 [refs]              |  2 +-
 trunk/fs/nfsd/vfs.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a85ac7863cfc..479135e855d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f632265d0ffb5acf331252d98c64939849d96bb2
+refs/heads/master: f6360efb83cd6dd1476cd758834c8277508c1f15
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c
index 96360a83cb91..661a6cf8e826 100644
--- a/trunk/fs/nfsd/vfs.c
+++ b/trunk/fs/nfsd/vfs.c
@@ -2033,15 +2033,17 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp,
 __be32
 nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat, int access)
 {
-	struct path path = {
-		.mnt	= fhp->fh_export->ex_path.mnt,
-		.dentry	= fhp->fh_dentry,
-	};
 	__be32 err;
 
 	err = fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP | access);
-	if (!err && vfs_statfs(&path, stat))
-		err = nfserr_io;
+	if (!err) {
+		struct path path = {
+			.mnt	= fhp->fh_export->ex_path.mnt,
+			.dentry	= fhp->fh_dentry,
+		};
+		if (vfs_statfs(&path, stat))
+			err = nfserr_io;
+	}
 	return err;
 }