From 84589b2e8b0aa790274b3376651a24054841f1ab Mon Sep 17 00:00:00 2001
From: Xiaotian Feng <xtfeng@gmail.com>
Date: Fri, 16 Nov 2012 14:14:55 -0800
Subject: [PATCH] --- yaml --- r: 335791 b: refs/heads/master c:
 f58b59c1df3cb990d644018e1461cd4acd3c1700 h: refs/heads/master i:   335789:
 b9d357dfd9002431bee10b62c926b08d5a605300   335787:
 73e941fbefe7fde75ee3f344147ec982e52bfd33   335783:
 2ef213276089595da8d0a21800f744b139752979   335775:
 019321392db351be30de85821d022c7256fcb722 v: v3

---
 [refs]              | 2 +-
 trunk/mm/swapfile.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 04b28b083705..c6265f9817c3 100644
--- 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
index 71cd288b2001..f91a25547ffe 100644
--- 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;
 }