From patchwork Sat May 11 02:44:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2553251 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 8764A3FC5A for ; Sat, 11 May 2013 02:44:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757197Ab3EKCou (ORCPT ); Fri, 10 May 2013 22:44:50 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:35923 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756664Ab3EKCou (ORCPT ); Fri, 10 May 2013 22:44:50 -0400 Received: by mail-wi0-f171.google.com with SMTP id hn3so1202873wib.16 for ; Fri, 10 May 2013 19:44:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=Wrj9ewQFfuhsEOJHxb2gg2HxKqY0uam9TsiFgP3qNEg=; b=wjrU0ASbrCmTtMsQikJmDhEy0E2tccs8n3idf/yup3BDNdagIrbski6XSpNqUVHPv8 0d8jsDEcP3lI6pE8aSdBrFM4u16jezhPLIUVoof+d6JiQ6rSTQ3fl0zufcxWAzB/ous6 6X17vODHnqupshgiCE0tItMSo4ybB9RROPlzQ02X0TF/ATiCDC4RAUtA+oJ9VsAMgAoj ASYRChg6MtF6TfcZQeIJBDcxk1RVsj5TiIwZ+xSNoZIDPVpUkROoNWX+R37ZNkJFKHyt hkUdSw/z0e1RKDfzfhn3MXur99b9BGbnJMF55gxXJjhe6zcq5iQix9IUVMa+FY6h8ZZn 0Hlw== X-Received: by 10.194.62.80 with SMTP id w16mr16970638wjr.16.1368240289089; Fri, 10 May 2013 19:44:49 -0700 (PDT) Received: from bhalevy-lt.il.tonian.com (bzq-79-180-144-28.red.bezeqint.net. [79.180.144.28]) by mx.google.com with ESMTPSA id i11sm1314985wiw.11.2013.05.10.19.44.48 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 19:44:48 -0700 (PDT) From: Benny Halevy To: linux-nfs@vger.kernel.org Subject: [PATCH 36/38] pnfsd: deprecate cbl_seg.clientid Date: Sat, 11 May 2013 05:44:44 +0300 Message-Id: <1368240284-1121-1-git-send-email-bhalevy@tonian.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <518B6377.3000207@tonian.com> References: <518B6377.3000207@tonian.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Use only cbl_sid for identification Signed-off-by: Benny Halevy --- 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) &&