2 files changed, 3 insertions, 4 deletions

diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c
index 2d85dd7415bb..a0f296d9928a 100644
--- a/fs/smbfs/request.c
+++ b/fs/smbfs/request.c
@@ -786,8 +786,7 @@ int smb_request_recv(struct smb_sb_info *server)
                 /* We should never be called with any of these states */
         case SMB_RECV_END:
         case SMB_RECV_REQUEST:
-                server->rstate = SMB_RECV_END;
-                break;
+                BUG();
         }
 
         if (result < 0) {
diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c
index 0c64bc3a0127..cdc53c4fb381 100644
--- a/fs/smbfs/symlink.c
+++ b/fs/smbfs/symlink.c
@@ -45,7 +45,7 @@ static void *smb_follow_link(struct dentry *dentry, struct nameidata *nd)
                 int len = smb_proc_read_link(server_from_dentry(dentry),
                                                 dentry, link, PATH_MAX - 1);
                 if (len < 0) {
-                        putname(link);
+                        __putname(link);
                         link = ERR_PTR(len);
                 } else {
                         link[len] = 0;
@@ -59,7 +59,7 @@ static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
 {
         char *s = nd_get_link(nd);
         if (!IS_ERR(s))
-                putname(s);
+                __putname(s);
 }
 
 struct inode_operations smb_link_inode_operations =