kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pNFS: Use the standard I/O stateid when calling LAYOUTGET

Browse source 
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:
Trond Myklebust 2017-09-11 13:09:37 -04:00
parent 1bd5d6d08e
commit 70d2f7b1ea
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/nfs/pnfs.c
View file

@ -1664,7 +1664,7 @@ pnfs_update_layout(struct inode *ino,
.offset = pos, .offset = pos,
.length = count, .length = count,
}; };
unsigned pg_offset, seq; unsigned pg_offset;
struct nfs_server *server = NFS_SERVER(ino); struct nfs_server *server = NFS_SERVER(ino);
struct nfs_client *clp = server->nfs_client; struct nfs_client *clp = server->nfs_client;
struct pnfs_layout_hdr *lo = NULL; struct pnfs_layout_hdr *lo = NULL;
@ -1754,10 +1754,14 @@ lookup_again:
} }
first = true; first = true;
do { if (nfs4_select_rw_stateid(ctx->state,
seq = read_seqbegin(&ctx->state->seqlock); iomode == IOMODE_RW ? FMODE_WRITE : FMODE_READ,
nfs4_stateid_copy(&stateid, &ctx->state->stateid); NULL, &stateid, NULL) != 0) {
} while (read_seqretry(&ctx->state->seqlock, seq)); trace_pnfs_update_layout(ino, pos, count,
iomode, lo, lseg,
PNFS_UPDATE_LAYOUT_INVALID_OPEN);
goto out_unlock;
}
} else { } else {
nfs4_stateid_copy(&stateid, &lo->plh_stateid); nfs4_stateid_copy(&stateid, &lo->plh_stateid);
} }