From patchwork Sun Aug 10 15:42:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 4704831 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9A54C9F375 for ; Sun, 10 Aug 2014 15:42:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BFC2E20160 for ; Sun, 10 Aug 2014 15:42:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEEB82015D for ; Sun, 10 Aug 2014 15:42:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751236AbaHJPmU (ORCPT ); Sun, 10 Aug 2014 11:42:20 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:51896 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751226AbaHJPmT (ORCPT ); Sun, 10 Aug 2014 11:42:19 -0400 Received: by mail-pa0-f52.google.com with SMTP id bj1so9644266pad.25 for ; Sun, 10 Aug 2014 08:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=ms3gYJLhnfxiFnfGtchRwJtaglkdk4mpK6GQ5XIpgE0=; b=yxTpRBEuBategjidflK+S7K5T9aMVYjsN6YphPV2ak+wXBD/cTF8fhXr5kYnb4hupO cjpdlYUyId58hkOSMjOUEbrj2lnvJBIol/+WXwQ59J1+bd14oTRcdjcG8HkX/OQnOL6T Pni+Ljtwpc9Q2kKcuqSGz8RzSptBqlsDzwEJ1mBzp3co1HPodAW2fSa4F/2ktvOKQVyu 44OWbv+M0KgqR6huLRmpI/uXxdxrp/ZRKElCylqGJH/tfJMQwLoAW8qs1jAk0Ki0AThA N/YQV8gXgKUIFh0Im1gx3TJ5Rjn/p8T0X9IZY+vShwYmeWY2PAJd3htAD4mRHxKatQS/ 4agA== X-Received: by 10.68.104.66 with SMTP id gc2mr36855445pbb.17.1407685339576; Sun, 10 Aug 2014 08:42:19 -0700 (PDT) Received: from [192.168.0.100] ([118.117.121.97]) by mx.google.com with ESMTPSA id qj1sm8780831pbb.24.2014.08.10.08.42.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Aug 2014 08:42:18 -0700 (PDT) Message-ID: <53E792CD.9080503@gmail.com> Date: Sun, 10 Aug 2014 23:42:05 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Jeff Layton CC: "J. Bruce Fields" , Linux NFS Mailing List , Trond Myklebust , linux-fsdevel@vger.kernel.org, kinglongmee@gmail.com Subject: [PATCH 2/3 v2] fs/locks.c: New ops in file_lock_operations for copying/releasing owner References: <53BAAAC5.9000106@gmail.com> <53E22EA5.70708@gmail.com> <20140809065112.700e0ecc@tlielax.poochiereds.net> <53E791F1.40802@gmail.com> In-Reply-To: <53E791F1.40802@gmail.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=-7.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 NFSD or other lockmanager may increase the owner's reference, so adds two new options for copying and releasing owner. v2: A new patch isn't exist in v1. Signed-off-by: Kinglong Mee --- fs/locks.c | 12 ++++++++++-- include/linux/fs.h | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index 91b0f03..f302a51 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -230,8 +230,12 @@ void locks_release_private(struct file_lock *fl) fl->fl_ops->fl_release_private(fl); fl->fl_ops = NULL; } - fl->fl_lmops = NULL; + if (fl->fl_lmops) { + if (fl->fl_lmops->lm_release_owner) + fl->fl_lmops->lm_release_owner(fl); + fl->fl_lmops = NULL; + } } EXPORT_SYMBOL_GPL(locks_release_private); @@ -262,8 +266,12 @@ static void locks_copy_private(struct file_lock *new, struct file_lock *fl) fl->fl_ops->fl_copy_lock(new, fl); new->fl_ops = fl->fl_ops; } - if (fl->fl_lmops) + + if (fl->fl_lmops) { + if (fl->fl_lmops->lm_copy_owner) + fl->fl_lmops->lm_copy_owner(new, fl); new->fl_lmops = fl->fl_lmops; + } } void locks_copy_lock(struct file_lock *new, struct file_lock *fl) diff --git a/include/linux/fs.h b/include/linux/fs.h index ced023d..622efca 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -843,6 +843,8 @@ struct file_lock_operations { struct lock_manager_operations { int (*lm_compare_owner)(struct file_lock *, struct file_lock *); unsigned long (*lm_owner_key)(struct file_lock *); + void (*lm_copy_owner)(struct file_lock *, struct file_lock *); + void (*lm_release_owner)(struct file_lock *); void (*lm_notify)(struct file_lock *); /* unblock callback */ int (*lm_grant)(struct file_lock *, struct file_lock *, int); void (*lm_break)(struct file_lock *);