diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-20 05:25:45 (GMT) |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-20 05:39:42 (GMT) |
| commit | 92b40e93849e29f9ca661de6442bb66282738bf7 (patch) | |
| tree | 3809ff1f036c1ecbdf7fd265046e49fdefe8eb68 /fs/nfs/nfs4state.c | |
| parent | 042ad0b398ea4e937e38324dd096bdf9d2c495f7 (diff) | |
| download | linux-fsl-qoriq-92b40e93849e29f9ca661de6442bb66282738bf7.tar.xz | |
NFSv4: Use the open stateid if the delegation has the wrong mode
Fix nfs4_select_rw_stateid() so that it chooses the open stateid
(or an all-zero stateid) if the delegation does not match the selected
read/write mode.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 1eb1728..b779695 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1024,12 +1024,16 @@ out: static int nfs4_copy_open_stateid(nfs4_stateid *dst, struct nfs4_state *state) { + const nfs4_stateid *src; int ret; int seq; do { + src = &zero_stateid; seq = read_seqbegin(&state->seqlock); - nfs4_stateid_copy(dst, &state->stateid); + if (test_bit(NFS_OPEN_STATE, &state->flags)) + src = &state->open_stateid; + nfs4_stateid_copy(dst, src); ret = 0; smp_rmb(); if (!list_empty(&state->owner->so_seqid.list)) |