---

yaml --- r: 180241 b: refs/heads/master c: 9b4b351 h: refs/heads/master i: 180239: 294e04a v: v3
git-mirror · Feb 3, 2010 · 593ee86 · 593ee86
1 parent dc240de
commit 593ee86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 387c149b54b4321cbc790dadbd4f8eedb5a90468
+refs/heads/master: 9b4b351346b41d923d69adec865814fdaac4dba9
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
@@ -1261,8 +1261,10 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
 
 	if (fattr->valid & NFS_ATTR_FATTR_MODE) {
 		if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)) {
+			umode_t newmode = inode->i_mode & S_IFMT;
+			newmode |= fattr->mode & S_IALLUGO;
+			inode->i_mode = newmode;
 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
-			inode->i_mode = fattr->mode;
 		}
 	} else if (server->caps & NFS_CAP_MODE)
 		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR