diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index c08c46a3b8cd..4e43fd1270c4 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -2589,7 +2589,8 @@ static inline void nfs4_exclusive_attrset(struct nfs4_opendata *opendata, | |||
| 2589 | 2589 | ||
| 2590 | /* Except MODE, it seems harmless of setting twice. */ | 2590 | /* Except MODE, it seems harmless of setting twice. */ |
| 2591 | if (opendata->o_arg.createmode != NFS4_CREATE_EXCLUSIVE && | 2591 | if (opendata->o_arg.createmode != NFS4_CREATE_EXCLUSIVE && |
| 2592 | attrset[1] & FATTR4_WORD1_MODE) | 2592 | (attrset[1] & FATTR4_WORD1_MODE || |
| 2593 | attrset[2] & FATTR4_WORD2_MODE_UMASK)) | ||
| 2593 | sattr->ia_valid &= ~ATTR_MODE; | 2594 | sattr->ia_valid &= ~ATTR_MODE; |
| 2594 | 2595 | ||
| 2595 | if (attrset[2] & FATTR4_WORD2_SECURITY_LABEL) | 2596 | if (attrset[2] & FATTR4_WORD2_SECURITY_LABEL) |