diff --git a/[refs] b/[refs]
index af92c8e62f7d..1c491492a97f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96c03bccc7defb1f0d486165af5c0b8590f56c11
+refs/heads/master: 835a36ca4a4cd9da557318c0e213346644a4b2c8
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index 5e9cc9c2fc7d..8bdbc818164c 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -111,6 +111,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
 
 	cifs_i->delete_pending = fattr->cf_flags & CIFS_FATTR_DELETE_PENDING;
 
+	cifs_i->server_eof = fattr->cf_eof;
 	/*
 	 * Can't safely change the file size here if the client is writing to
 	 * it due to potential races.