***************
*** 1157,1166 ****
  	} else if (S_ISREG(inode->i_mode) && new_isize > cur_size)
  			nfsi->flags |= NFS_INO_INVALID_ATTR;
  
  	/* Have any file permissions changed? */
  	if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)
- 			|| inode->i_uid != fattr->uid
- 			|| inode->i_gid != fattr->gid)
  		nfsi->flags |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS;
  
  	/* Has the link count changed? */
--- 1175,1189 ----
  	} else if (S_ISREG(inode->i_mode) && new_isize > cur_size)
  			nfsi->flags |= NFS_INO_INVALID_ATTR;
  
+ 	uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
+ 	gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
+ 	xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
+ 
  	/* Have any file permissions changed? */
  	if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)
+ 			|| inode->i_uid != uid
+ 			|| inode->i_gid != gid
+ 			|| inode->i_xid != xid)
  		nfsi->flags |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS;
  
  	/* Has the link count changed? */
***************
*** 1276,1282 ****
  	memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
  	memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
  
  	if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
- 	    inode->i_uid != fattr->uid ||
- 	    inode->i_gid != fattr->gid)
  		invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS;
--- 1302,1313 ----
  	memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
  	memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
  
+ 	uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
+ 	gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
+ 	xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
+ 
  	if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
+ 	    inode->i_uid != uid ||
+ 	    inode->i_gid != gid ||
+ 	    inode->i_xid != xid)
  		invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS;