From 45a7fb85cbb0bb48b9cdd0a86ad0c46693ddf5c4 Mon Sep 17 00:00:00 2001
From: Davidlohr Bueso <dave@gnu.org>
Date: Wed, 11 Aug 2010 12:42:15 -0400
Subject: [PATCH] --- yaml --- r: 209656 b: refs/heads/master c:
 5d7ca35a182a626f8ed5596023ad42eb219a332e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d715a495565e..963e4d298b7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b00c64318cc337846a7a08a5678f5f19aeff188
+refs/heads/master: 5d7ca35a182a626f8ed5596023ad42eb219a332e
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 7ffbb98ddec3..6b44bbfb7d8a 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -2273,8 +2273,7 @@ static int nfs4_get_referral(struct inode *dir, const struct qstr *name, struct
 out:
 	if (page)
 		__free_page(page);
-	if (locations)
-		kfree(locations);
+	kfree(locations);
 	return status;
 }