diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
| commit | e2160156bf2a7d5018e99a9993fbcdda0abac09b (patch) | |
| tree | 1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /fs/nfs/nfs4proc.c | |
| parent | 62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff) | |
| parent | 6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff) | |
| download | linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ecc151697fd4..0a0eaecf9676 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2700,7 +2700,8 @@ static inline void nfs4_exclusive_attrset(struct nfs4_opendata *opendata, sattr->ia_valid |= ATTR_MTIME; /* Except MODE, it seems harmless of setting twice. */ - if ((attrset[1] & FATTR4_WORD1_MODE)) + if (opendata->o_arg.createmode != NFS4_CREATE_EXCLUSIVE && + attrset[1] & FATTR4_WORD1_MODE) sattr->ia_valid &= ~ATTR_MODE; if (attrset[2] & FATTR4_WORD2_SECURITY_LABEL) @@ -8490,6 +8491,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, goto out; } + nfs4_sequence_free_slot(&lgp->res.seq_res); err = nfs4_handle_exception(server, nfs4err, exception); if (!status) { if (exception->retry) |