From patchwork Sat May 11 02:44:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2553261 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 A16903FE81 for ; Sat, 11 May 2013 02:44:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756801Ab3EKCoy (ORCPT ); Fri, 10 May 2013 22:44:54 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:35262 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754337Ab3EKCox (ORCPT ); Fri, 10 May 2013 22:44:53 -0400 Received: by mail-wi0-f181.google.com with SMTP id ey16so1205922wid.14 for ; Fri, 10 May 2013 19:44:52 -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=x00Xn6u7/Q2A8HReIG7RJ4SyR9RZl7IDCK1byxZiAP8=; b=G3q1t5MKQ0pXYz+3jYJVxlwWm3++Du+A4XTJ33dixkqR4TuFSyF1rSHeiCoNaVD79s zN7Uc0iaKkWj5Gr79x074YljOXsTd8zVrAOXhF1uIDcPupxBEJnj+wRFHNhIZT7tn3zA sXDi5et3FMEzF760L5Yrfp6DEI+MtbeXuq5Dud9vxxgup5NygFQQ+1n4hI8cImLEHfFV OkuIVM/i7TPk/qI2hRtpcUTAjeTpgNozvC0M1Q70ji+diUZMjaL1A7wkTHQO7Wdi8YCN 31NaE3e97Nymr4S0UDE/01CDB/dM8Yap+4GzxB92bG7H49ddElpGP/bV0W/eUGxJ0fgt KZNA== X-Received: by 10.194.58.243 with SMTP id u19mr28186208wjq.47.1368240292668; Fri, 10 May 2013 19:44:52 -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 je7sm1170147wic.9.2013.05.10.19.44.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 19:44:52 -0700 (PDT) From: Benny Halevy To: linux-nfs@vger.kernel.org Subject: [PATCH 37/38] pnfsd: don't use clientid in merge_layout Date: Sat, 11 May 2013 05:44:48 +0300 Message-Id: <1368240288-1165-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 The layout state is already associated with the clientid so there is no need to recheck Signed-off-by: Benny Halevy --- 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);