Use only cbl_sid for identification Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxx> --- fs/nfsd/nfs4pnfsd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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) && -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html