diff options
| author | Dave Airlie | 2017-11-02 03:40:41 +0100 |
|---|---|---|
| committer | Dave Airlie | 2017-11-02 03:40:41 +0100 |
| commit | 7a88cbd8d65d622c00bd76ba4ae1d893b292c91c (patch) | |
| tree | 826df7ac42ca13c33828d0142046186b91df686b /fs/nfs/nfs4proc.c | |
| parent | Merge tag 'drm-hisilicon-next-2017-11-01' of github.com:xin3liang/linux into ... (diff) | |
| parent | Linux 4.14-rc7 (diff) | |
| download | kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.tar.gz kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.tar.xz kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.zip | |
Backmerge tag 'v4.14-rc7' into drm-next
Linux 4.14-rc7
Requested by Ben Skeggs for nouveau to avoid major conflicts,
and things were getting a bit conflicty already, esp around amdgpu
reverts.
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6c61e2b99635..f90090e8c959 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8399,8 +8399,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, lo = NFS_I(inode)->layout; /* If the open stateid was bad, then recover it. */ if (!lo || test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags) || - nfs4_stateid_match_other(&lgp->args.stateid, - &lgp->args.ctx->state->stateid)) { + !nfs4_stateid_match_other(&lgp->args.stateid, &lo->plh_stateid)) { spin_unlock(&inode->i_lock); exception->state = lgp->args.ctx->state; exception->stateid = &lgp->args.stateid; |