From a27f57ca297ca47fb62b65086c5bbe822c462076 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 12 Feb 2013 13:03:42 -0700
Subject: [PATCH] --- yaml --- r: 352975 b: refs/heads/master c:
 96aa1549afa6c79ae4a4f099de861efd218c38d8 h: refs/heads/master i:   352973:
 42c3f582c63353f5e16b2eeb424d81ea715817b9   352971:
 bc737756c69dcfcb5c6ff369916e15120035abf0   352967:
 e8a000d8a68d2ad2917a0a5cee20691964a66f3c   352959:
 1a4448f308908307c7f1540e44175aef373e649d v: v3

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

diff --git a/[refs] b/[refs]
index 49c123444f7d..ea4641a1e43e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 085b7a45c63d3da5be155faab9249a5cab224561
+refs/heads/master: 96aa1549afa6c79ae4a4f099de861efd218c38d8
diff --git a/trunk/fs/nfs/getroot.c b/trunk/fs/nfs/getroot.c
index 033803c36644..44efaa8c5f78 100644
--- a/trunk/fs/nfs/getroot.c
+++ b/trunk/fs/nfs/getroot.c
@@ -126,8 +126,7 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh,
 	}
 	spin_unlock(&ret->d_lock);
 out:
-	if (name)
-		kfree(name);
+	kfree(name);
 	nfs_free_fattr(fsinfo.fattr);
 	return ret;
 }
diff --git a/trunk/fs/nfs/unlink.c b/trunk/fs/nfs/unlink.c
index 13cea637eff8..d26a32f5b53b 100644
--- a/trunk/fs/nfs/unlink.c
+++ b/trunk/fs/nfs/unlink.c
@@ -268,8 +268,7 @@ nfs_async_unlink(struct inode *dir, struct dentry *dentry)
 	 * point dentry is definitely not a root, so we won't need
 	 * that anymore.
 	 */
-	if (devname_garbage)
-		kfree(devname_garbage);
+	kfree(devname_garbage);
 	return 0;
 out_unlock:
 	spin_unlock(&dentry->d_lock);