diff mbox

[36/38] pnfsd: deprecate cbl_seg.clientid

Message ID 1368240284-1121-1-git-send-email-bhalevy@tonian.com (mailing list archive)
State New, archived
Headers show

Commit Message

Benny Halevy May 11, 2013, 2:44 a.m. UTC 
Use only cbl_sid for identification

Signed-off-by: Benny Halevy <bhalevy@tonian.com>
---
 fs/nfsd/nfs4pnfsd.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/fs/nfsd/nfs4pnfsd.c b/fs/nfsd/nfs4pnfsd.c
index 0ef351d..45111fe 100644
--- a/fs/nfsd/nfs4pnfsd.c
+++ b/fs/nfsd/nfs4pnfsd.c
@@ -1247,8 +1247,8 @@  struct create_recall_list_arg {
 	stateid_t *stid = (stateid_t *)&cbl->cbl_sid;
 	struct nfs4_layout *lo;
 
-	dprintk("%s: ino=%lu clientid=%llux iomode=%u", __func__,
-		fp->fi_inode->i_ino, cbl->cbl_seg.clientid,
+	dprintk("%s: ino=%lu stateid=" STATEID_FMT " iomode=%u", __func__,
+		fp->fi_inode->i_ino, STATEID_VAL(stid),
 		cbl->cbl_seg.iomode);
 
 	list_for_each_entry (ls, &fp->fi_lo_states, ls_perfile) {
@@ -1256,11 +1256,6 @@  struct create_recall_list_arg {
 		    !same_stid(stid, &ls->ls_stid.sc_stateid))
 			continue;
 
-		if (cbl->cbl_seg.clientid &&
-		    !same_clid(&ls->ls_client->cl_clientid,
-			       (clientid_t *)&cbl->cbl_seg.clientid))
-			continue;
-
 		list_for_each_entry (lo, &ls->ls_layouts, lo_perstate)
 			if (cbl->cbl_seg.layout_type == lo->lo_seg.layout_type &&
 			    lo_seg_overlapping(&cbl->cbl_seg, &lo->lo_seg) &&