---

yaml --- r: 335791 b: refs/heads/master c: f58b59c h: refs/heads/master i: 335789: b9d357d 335787: 73e941f 335783: 2ef2132 335775: 0193213 v: v3
git-mirror · Nov 16, 2012 · 84589b2 · 84589b2
1 parent 5a281d4
commit 84589b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bea8c150a7efbc0f204e709b7274fe273f55e0d3
+refs/heads/master: f58b59c1df3cb990d644018e1461cd4acd3c1700
diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c
@@ -1494,9 +1494,8 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
 	BUG_ON(!current->mm);
 
 	pathname = getname(specialfile);
-	err = PTR_ERR(pathname);
 	if (IS_ERR(pathname))
-		goto out;
+		return PTR_ERR(pathname);
 
 	victim = file_open_name(pathname, O_RDWR|O_LARGEFILE, 0);
 	err = PTR_ERR(victim);
@@ -1608,6 +1607,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
 out_dput:
 	filp_close(victim, NULL);
 out:
+	putname(pathname);
 	return err;
 }