The layout state is already associated with the clientid so there is no need to recheck Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxx> --- fs/nfsd/nfs4pnfsd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/nfsd/nfs4pnfsd.c b/fs/nfsd/nfs4pnfsd.c index 45111fe..0c05a22 100644 --- a/fs/nfsd/nfs4pnfsd.c +++ b/fs/nfsd/nfs4pnfsd.c @@ -626,7 +626,6 @@ struct super_block * spin_lock(&layout_lock); list_for_each_entry (lp, &ls->ls_layouts, lo_perstate) if (lp->lo_seg.layout_type == seg->layout_type && - lp->lo_seg.clientid == seg->clientid && lp->lo_seg.iomode == seg->iomode && (ret = lo_seg_mergeable(&lp->lo_seg, seg))) { extend_layout(&lp->lo_seg, 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