mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
pNFS: Use the standard I/O stateid when calling LAYOUTGET
Instead of having a private method for copying the open/delegation stateid, use the same call that is used for standard I/O through the MDS. Note that this means we transmit the stateid with a zero seqid, avoiding issues with NFS4ERR_OLD_STATEID. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
1bd5d6d08e
commit
70d2f7b1ea
1 changed files with 9 additions and 5 deletions
|
@ -1664,7 +1664,7 @@ pnfs_update_layout(struct inode *ino,
|
|||
.offset = pos,
|
||||
.length = count,
|
||||
};
|
||||
unsigned pg_offset, seq;
|
||||
unsigned pg_offset;
|
||||
struct nfs_server *server = NFS_SERVER(ino);
|
||||
struct nfs_client *clp = server->nfs_client;
|
||||
struct pnfs_layout_hdr *lo = NULL;
|
||||
|
@ -1754,10 +1754,14 @@ pnfs_update_layout(struct inode *ino,
|
|||
}
|
||||
|
||||
first = true;
|
||||
do {
|
||||
seq = read_seqbegin(&ctx->state->seqlock);
|
||||
nfs4_stateid_copy(&stateid, &ctx->state->stateid);
|
||||
} while (read_seqretry(&ctx->state->seqlock, seq));
|
||||
if (nfs4_select_rw_stateid(ctx->state,
|
||||
iomode == IOMODE_RW ? FMODE_WRITE : FMODE_READ,
|
||||
NULL, &stateid, NULL) != 0) {
|
||||
trace_pnfs_update_layout(ino, pos, count,
|
||||
iomode, lo, lseg,
|
||||
PNFS_UPDATE_LAYOUT_INVALID_OPEN);
|
||||
goto out_unlock;
|
||||
}
|
||||
} else {
|
||||
nfs4_stateid_copy(&stateid, &lo->plh_stateid);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue