1 files changed, 20 insertions, 4 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index d9567ba2960b..b1a4a65eaa08 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -586,10 +586,18 @@ static const struct inode_operations cifs_ipc_inode_ops = {
 };
 
 /* gets root inode */
-void cifs_read_inode(struct inode *inode)
+struct inode *cifs_iget(struct super_block *sb, unsigned long ino)
 {
-        int xid, rc;
+        int xid;
         struct cifs_sb_info *cifs_sb;
+        struct inode *inode;
+        long rc;
+
+        inode = iget_locked(sb, ino);
+        if (!inode)
+                return ERR_PTR(-ENOMEM);
+        if (!(inode->i_state & I_NEW))
+                return inode;
 
         cifs_sb = CIFS_SB(inode->i_sb);
         xid = GetXid();
@@ -606,10 +614,18 @@ void cifs_read_inode(struct inode *inode)
                 inode->i_fop = &simple_dir_operations;
                 inode->i_uid = cifs_sb->mnt_uid;
                 inode->i_gid = cifs_sb->mnt_gid;
+                _FreeXid(xid);
+                iget_failed(inode);
+                return ERR_PTR(rc);
         }
 
-        /* can not call macro FreeXid here since in a void func */
+        unlock_new_inode(inode);
+
+        /* can not call macro FreeXid here since in a void func
+         * TODO: This is no longer true
+         */
         _FreeXid(xid);
+        return inode;
 }
 
 int cifs_unlink(struct inode *inode, struct dentry *direntry)
@@ -1386,7 +1402,7 @@ static int cifs_truncate_page(struct address_space *mapping, loff_t from)
         if (!page)
                 return -ENOMEM;
 
-        zero_user_page(page, offset, PAGE_CACHE_SIZE - offset, KM_USER0);
+        zero_user_segment(page, offset, PAGE_CACHE_SIZE);
         unlock_page(page);
         page_cache_release(page);
         return rc;