From bb81eb1e69176fff19023f64f15da48b64a5a276 Mon Sep 17 00:00:00 2001
From: Prasad P <pvp@us.ibm.com>
Date: Wed, 24 Oct 2007 15:14:32 -0500
Subject: [PATCH] --- yaml --- r: 82404 b: refs/heads/master c:
 aefa89d178e6dd83889b66d4e800d4d77363900b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5a3254220062..8c7e5d4aa1aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63c86716ea34ad94d52e5b0abbda152574dc42b5
+refs/heads/master: aefa89d178e6dd83889b66d4e800d4d77363900b
diff --git a/trunk/fs/nfsd/nfs2acl.c b/trunk/fs/nfsd/nfs2acl.c
index 0e5fa11e6b44..1c3b7654e966 100644
--- a/trunk/fs/nfsd/nfs2acl.c
+++ b/trunk/fs/nfsd/nfs2acl.c
@@ -221,12 +221,17 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p,
 		struct nfsd3_getaclres *resp)
 {
 	struct dentry *dentry = resp->fh.fh_dentry;
-	struct inode *inode = dentry->d_inode;
+	struct inode *inode;
 	struct kvec *head = rqstp->rq_res.head;
 	unsigned int base;
 	int n;
 	int w;
 
+	/*
+	 * Since this is version 2, the check for nfserr in
+	 * nfsd_dispatch actually ensures the following cannot happen.
+	 * However, it seems fragile to depend on that.
+	 */
 	if (dentry == NULL || dentry->d_inode == NULL)
 		return 0;
 	inode = dentry->d_inode;