From patchwork Fri Dec 13 10:03:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 3339501 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 22731C0D4A for ; Fri, 13 Dec 2013 10:04:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83373206EA for ; Fri, 13 Dec 2013 10:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74698206E9 for ; Fri, 13 Dec 2013 10:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752288Ab3LMKDx (ORCPT ); Fri, 13 Dec 2013 05:03:53 -0500 Received: from mail-ee0-f44.google.com ([74.125.83.44]:44985 "EHLO mail-ee0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752274Ab3LMKDx (ORCPT ); Fri, 13 Dec 2013 05:03:53 -0500 Received: by mail-ee0-f44.google.com with SMTP id b57so756499eek.17 for ; Fri, 13 Dec 2013 02:03:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=J7n4os5f/5zc3tDNSFiwgXYRtVmMGERPa1L8VPV/Wqw=; b=wEcB/UIZB1T6CH4Rg/EE/qv20J0B/j6OfzwMqlH631tlD+cHUrL99AL7YWajUMz+KR h1U8wUWSPypvnjrQgPG2xy3jttzpckARBmTwU/xk1fItLksfFMc1yaVV/EfZEB+N2/aP sfKwc7D3+bJCYZAN8teJqs0rda/CAjnbwPOVlGEhKYltZRgSXLiXN9iZ+NCP5ZnZS5lI eOx4Lg4u3p+xK+/u6y04f3hxW3GaIT/UX7S5oUYt5MGEW3ceWQ3bZ0ulvqZ+oUroVIJ+ Q5RL/ajNOqwbQ91ImwEW5ZheyCwh3Cjffm7rTwIBg0kUEFID6yTr5UvoDXPxOnLs9t/E tgCw== X-Received: by 10.15.24.142 with SMTP id j14mr1959754eeu.52.1386929032151; Fri, 13 Dec 2013 02:03:52 -0800 (PST) Received: from localhost.il.tonian.com (bzq-79-181-130-207.red.bezeqint.net. [79.181.130.207]) by mx.google.com with ESMTPSA id 44sm4953461eek.5.2013.12.13.02.03.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Dec 2013 02:03:49 -0800 (PST) From: Benny Halevy To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org, Benny Halevy Subject: [PATCH 2/2] nfsd4: ignore nfsv4.1 lockowners in nfsd4_release_lockowner Date: Fri, 13 Dec 2013 12:03:46 +0200 Message-Id: <1386929026-12627-1-git-send-email-bhalevy@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <52AADAF6.40700@primarydata.com> References: <52AADAF6.40700@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP RELEASE_LOCKOWNER is a NFSv4.0 operation only so it can quickly skip lockowners created by nfsv4.1 clients. Signed-off-by: Benny Halevy --- fs/nfsd/nfs4state.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 84007b6..00424f2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4652,6 +4652,8 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, list_for_each_entry(sop, &nn->ownerstr_hashtbl[hashval], so_strhash) { if (sop->so_is_open_owner) continue; + if (sop->so_client->cl_minorversion) + continue; if (!same_owner_str(sop, owner, clid)) continue; list_for_each_entry(stp, &sop->so_stateids,