1 files changed, 11 insertions, 13 deletions

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 2cb87ba4b1c1..7a7ec2d1d2f4 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -204,7 +204,6 @@ struct inode *v9fs_get_inode(struct super_block *sb, int mode)
                 inode->i_mode = mode;
                 inode->i_uid = current->fsuid;
                 inode->i_gid = current->fsgid;
-                inode->i_blksize = sb->s_blocksize;
                 inode->i_blocks = 0;
                 inode->i_rdev = 0;
                 inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@ -300,7 +299,7 @@ clunk_fid:
         fid = V9FS_NOFID;
 
 put_fid:
-        if (fid >= 0)
+        if (fid != V9FS_NOFID)
                 v9fs_put_idpool(fid, &v9ses->fidpool);
 
         kfree(fcall);
@@ -434,11 +433,11 @@ static int v9fs_remove(struct inode *dir, struct dentry *file, int rmdir)
         result = v9fs_t_remove(v9ses, fid, &fcall);
         if (result < 0) {
                 PRINT_FCALL_ERROR("remove fails", fcall);
-        } else {
-                v9fs_put_idpool(fid, &v9ses->fidpool);
-                v9fs_fid_destroy(v9fid);
         }
 
+        v9fs_put_idpool(fid, &v9ses->fidpool);
+        v9fs_fid_destroy(v9fid);
+
         kfree(fcall);
         return result;
 }
@@ -530,9 +529,6 @@ error:
         if (vfid)
                 v9fs_fid_destroy(vfid);
 
-        if (inode)
-                iput(inode);
-
         return err;
 }
 
@@ -953,9 +949,8 @@ v9fs_stat2inode(struct v9fs_stat *stat, struct inode *inode,
 
         inode->i_size = stat->length;
 
-        inode->i_blksize = sb->s_blocksize;
         inode->i_blocks =
-            (inode->i_size + inode->i_blksize - 1) >> sb->s_blocksize_bits;
+            (inode->i_size + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
 }
 
 /**
@@ -1054,6 +1049,9 @@ static int v9fs_vfs_readlink(struct dentry *dentry, char __user * buffer,
         int ret;
         char *link = __getname();
 
+        if (unlikely(!link))
+                return -ENOMEM;
+
         if (buflen > PATH_MAX)
                 buflen = PATH_MAX;
 
@@ -1171,9 +1169,6 @@ error:
         if (vfid)
                 v9fs_fid_destroy(vfid);
 
-        if (inode)
-                iput(inode);
-
         return err;
 
 }
@@ -1227,6 +1222,9 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
         }
 
         name = __getname();
+        if (unlikely(!name))
+                return -ENOMEM;
+
         sprintf(name, "%d\n", oldfid->fid);
         retval = v9fs_vfs_mkspecial(dir, dentry, V9FS_DMLINK, name);
         __putname(name);