Merge 3.7-rc6 into char-misc-next

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 71cd288b2001..f91a25547ffe 100644
--- a/mm/swapfile.c
+++ b/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;
 }