From 88762f6c17c846d306186ceca8c488d61b7688d8 Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Thu, 16 Feb 2012 06:21:30 -0800
Subject: [PATCH] --- yaml --- r: 292293 b: refs/heads/master c:
 28042fabf43b9a8ccfaa38f8c8187cc525e53fd3 h: refs/heads/master i:   292291:
 aeb8efb4e7e2a01df9cfff2452caca804cd43c88 v: v3

---
 [refs]                         | 2 +-
 trunk/security/apparmor/path.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 96dba20ceabf..f56c33fa5c30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38305a4bab4be5d278443b057f7f5e97afb07f26
+refs/heads/master: 28042fabf43b9a8ccfaa38f8c8187cc525e53fd3
diff --git a/trunk/security/apparmor/path.c b/trunk/security/apparmor/path.c
index 9d070a7c3ffc..c31ce837fef4 100644
--- a/trunk/security/apparmor/path.c
+++ b/trunk/security/apparmor/path.c
@@ -91,9 +91,8 @@ static int d_namespace_path(struct path *path, char *buf, int buflen,
 		}
 		path_put(&root);
 		connected = 0;
-	}
-
-	res = d_absolute_path(path, buf, buflen);
+	} else
+		res = d_absolute_path(path, buf, buflen);
 
 	*name = res;
 	/* handle error conditions - and still allow a partial path to