[38/38] pnfsd: remove clientid member from struct nfsd4_layout_seg

Commit Message

Benny Halevy May 11, 2013, 2:44 a.m. UTC

Use layout stateid for identification instead.

Signed-off-by: Benny Halevy <[e-mail]>
---
 fs/nfsd/nfs4proc.c              | 2 --
 include/linux/nfsd/nfsd4_pnfs.h | 1 -
 2 files changed, 3 deletions(-)

Patch

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index cd52393..5bbd1a3 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1243,8 +1243,6 @@  static int fill_in_write_vector(struct kvec *vec, struct nfsd4_write *write)
 		__func__, lcp->args.lc_newoffset, lcp->args.lc_last_wr + 1,
 		ino->i_size);
 
-	/* Set clientid from sessionid */
-	copy_clientid((clientid_t *)&lcp->args.lc_seg.clientid, cstate->session);
 	lcp->res.lc_size_chg = 0;
 	if (sb->s_pnfs_op->layout_commit) {
 		status = sb->s_pnfs_op->layout_commit(ino, &lcp->args, &lcp->res);
diff --git a/include/linux/nfsd/nfsd4_pnfs.h b/include/linux/nfsd/nfsd4_pnfs.h
index 2e09065..fd7bad9 100644
--- a/include/linux/nfsd/nfsd4_pnfs.h
+++ b/include/linux/nfsd/nfsd4_pnfs.h
@@ -59,7 +59,6 @@  struct nfsd4_pnfs_dev_iter_res {
 };
 
 struct nfsd4_layout_seg {
-	u64	clientid;
 	u32	layout_type;
 	u32	iomode;
 	u64	offset;