5 files changed, 10 insertions, 11 deletions

diff --git a/fs/9p/error.c b/fs/9p/error.c
index fee5d19179..834cb179e3 100644
--- a/fs/9p/error.c
+++ b/fs/9p/error.c
@@ -33,6 +33,7 @@
 
 #include <linux/list.h>
 #include <linux/jhash.h>
+#include <linux/string.h>
 
 #include "debug.h"
 #include "error.h"
diff --git a/fs/9p/trans_sock.c b/fs/9p/trans_sock.c
index 01e26f0013..a93c2bf94c 100644
--- a/fs/9p/trans_sock.c
+++ b/fs/9p/trans_sock.c
@@ -269,8 +269,7 @@ static void v9fs_sock_close(struct v9fs_transport *trans)
                 dprintk(DEBUG_TRANS, "socket closed\n");
         }
 
-        if (ts)
-                kfree(ts);
+        kfree(ts);
 
         trans->priv = NULL;
 }
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 82303f3bf7..418c3743fd 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -266,7 +266,7 @@ v9fs_session_init(struct v9fs_session_info *v9ses,
 
         v9ses->remotename = __getname();
         if (!v9ses->remotename) {
-                putname(v9ses->name);
+                __putname(v9ses->name);
                 return -ENOMEM;
         }
 
@@ -411,8 +411,8 @@ void v9fs_session_close(struct v9fs_session_info *v9ses)
         if (v9ses->transport)
                 v9ses->transport->close(v9ses->transport);
 
-        putname(v9ses->name);
-        putname(v9ses->remotename);
+        __putname(v9ses->name);
+        __putname(v9ses->remotename);
 }
 
 /**
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index bbc3cc6385..89c849da85 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -32,7 +32,6 @@
 #include <linux/string.h>
 #include <linux/smp_lock.h>
 #include <linux/inet.h>
-#include <linux/version.h>
 #include <linux/list.h>
 #include <asm/uaccess.h>
 #include <linux/idr.h>
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 2b696ae665..be7288184f 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -1105,7 +1105,7 @@ static int v9fs_vfs_readlink(struct dentry *dentry, char __user * buffer,
                 }
         }
 
-        putname(link);
+        __putname(link);
         return retval;
 }
 
@@ -1129,7 +1129,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
                 len = v9fs_readlink(dentry, link, strlen(link));
 
                 if (len < 0) {
-                        putname(link);
+                        __putname(link);
                         link = ERR_PTR(len);
                 } else
                         link[len] = 0;
@@ -1152,7 +1152,7 @@ static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void
 
         dprintk(DEBUG_VFS, " %s %s\n", dentry->d_name.name, s);
         if (!IS_ERR(s))
-                putname(s);
+                __putname(s);
 }
 
 /**
@@ -1228,7 +1228,7 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
       FreeMem:
         kfree(mistat);
         kfree(fcall);
-        putname(symname);
+        __putname(symname);
         return retval;
 }
 
@@ -1319,7 +1319,7 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
       FreeMem:
         kfree(mistat);
         kfree(fcall);
-        putname(symname);
+        __putname(symname);
 
         return retval;
 }