---

yaml --- r: 292293 b: refs/heads/master c: 28042fa h: refs/heads/master i: 292291: aeb8efb v: v3
git-mirror · Feb 27, 2012 · 88762f6 · 88762f6
1 parent c009c47
commit 88762f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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