linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kinglong Mee <kinglongmee@gmail.com>
To: Jeff Layton <jeff.layton@primarydata.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
	Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
	Trond Myklebust <trond.myklebust@primarydata.com>,
	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
Date: Sun, 10 Aug 2014 23:42:05 +0800	[thread overview]
Message-ID: <53E792CD.9080503@gmail.com> (raw)
In-Reply-To: <53E791F1.40802@gmail.com>

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 <kinglongmee@gmail.com>
---
 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 *);
-- 
1.9.3


  reply	other threads:[~2014-08-10 15:42 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-07 14:12 [PATCH 2/4] NFSD: Rervert "knfsd: locks: flag NFSv4-owned locks" Kinglong Mee
2014-07-07 16:45 ` Jeff Layton
2014-07-08  2:30   ` Kinglong Mee
2014-07-07 17:26 ` Jeff Layton
2014-07-08  3:23   ` Kinglong Mee
2014-07-08 11:03     ` Jeff Layton
2014-07-08 12:26       ` Kinglong Mee
2014-07-08 12:39         ` Jeff Layton
2014-07-11 22:11           ` J. Bruce Fields
2014-08-02 14:45 ` [PATCH] fs/locks.c: Copy fl_lmops to conflock for nfsd using Kinglong Mee
2014-08-02 14:59   ` Trond Myklebust
2014-08-02 23:05   ` Jeff Layton
2014-08-05 19:14     ` J. Bruce Fields
2014-08-05 19:20       ` Jeff Layton
2014-08-06 13:33 ` [PATCH 1/3] NFSD: New FL_NFSD for marking file_lock belongs to NFSD Kinglong Mee
2014-08-06 13:35   ` [PATCH 2/3] NFSD: Increase the reference of lockowner when coping file_lock Kinglong Mee
2014-08-06 13:38     ` [PATCH 3/3 RFC] fs/locks.c: Copy all infomation for conflock Kinglong Mee
2014-08-09 11:08     ` [PATCH 2/3] NFSD: Increase the reference of lockowner when coping file_lock Jeff Layton
2014-08-10 15:47       ` Kinglong Mee
2014-08-09 10:51   ` [PATCH 1/3] NFSD: New FL_NFSD for marking file_lock belongs to NFSD Jeff Layton
2014-08-10 12:46     ` Kinglong Mee
2014-08-10 15:38     ` [PATCH 1/3 v2] fs/locks.c: Copy all information for conflock Kinglong Mee
2014-08-10 15:42       ` Kinglong Mee [this message]
2014-08-10 15:43       ` [PATCH 3/3 v2] NFSD: Increase the reference of lockowner when coping file_lock Kinglong Mee
2014-08-11 16:46         ` Jeff Layton
2014-08-14 12:30           ` Kinglong Mee
2014-08-11 16:19       ` [PATCH 1/3 v2] fs/locks.c: Copy all information for conflock Jeff Layton
2014-08-11 16:25         ` Joe Perches
2014-08-14 12:59           ` Kinglong Mee
2014-08-14 12:26         ` Kinglong Mee
2014-08-14 14:00           ` Jeff Layton
2014-08-14 14:04             ` Kinglong Mee
2014-08-15  0:02       ` [PATCH 1/5 v3] NFSD: Remove duplicate initialization of file_lock Kinglong Mee
2014-08-15 10:57         ` Jeff Layton
2014-08-15 21:35           ` J. Bruce Fields
2014-08-15  0:07       ` [PATCH 2/5 v3] locks: Copy all infomation for conflock Kinglong Mee
2014-08-15 11:14         ` Jeff Layton
2014-08-15 14:33           ` Kinglong Mee
2014-08-16 13:35             ` Kinglong Mee
2014-08-17 13:42               ` Kinglong Mee
2014-08-18 11:54                 ` Jeff Layton
2014-08-19 15:10                   ` Kinglong Mee
2014-08-15  0:09       ` [PATCH 3/5 v3] locks: New ops in file_lock_operations for copy/release owner Kinglong Mee
2014-08-15  0:10       ` [PATCH 4/5 v3] NFSD: New helper nfs4_get_stateowner() for atomic_inc reference Kinglong Mee
2014-08-15  0:13       ` [PATCH 5/5 v3] NFSD: Increase the reference of lockowner when coping file_lock Kinglong Mee
2014-08-19 15:16         ` [PATCH 1/6 v4] NFSD: Remove the duplicate initialize of file_lock Kinglong Mee
2014-08-19 15:18         ` [PATCH 2/6 v4] locks: New ops in file_lock_operations for get/put owner Kinglong Mee
2014-08-19 19:42           ` Jeff Layton
2014-08-19 15:21         ` [PATCH 3/6 v4] locks: Rename __locks_copy_lock() to locks_copy_conflock() Kinglong Mee
2014-08-19 19:46           ` Jeff Layton
2014-08-19 15:24         ` [PATCH 4/6 v4] locks: Copy fl_lmops information for conflock in, locks_copy_conflock() Kinglong Mee
2014-08-19 20:08           ` Jeff Layton
2014-08-19 15:25         ` [PATCH 5/6 v4] NFSD: New helper nfs4_get_stateowner() for atomic_inc sop reference Kinglong Mee
2014-08-19 20:14           ` Jeff Layton
2014-08-19 15:26         ` [PATCH 6/6 v4] NFSD: Increase the reference of lockowner when coping file_lock Kinglong Mee
2014-08-19 20:23           ` Jeff Layton
2014-08-19 20:24             ` J. Bruce Fields
2014-08-20 10:02             ` Kinglong Mee
2014-08-20  9:51           ` [PATCH 1/6 v5] NFSD: Remove the duplicate initialize of file_lock Kinglong Mee
2014-08-20  9:53           ` [PATCH 2/6 v5] locks: Rename __locks_copy_lock() to locks_copy_conflock() Kinglong Mee
2014-08-20  9:54           ` [PATCH 3/6 v5] locks: New ops in file_lock_operations for get/put owner Kinglong Mee
2014-08-20  9:56           ` [PATCH 4/6 v5] locks: Copy fl_lmops information for conflock in locks_copy_conflock() Kinglong Mee
2014-08-20  9:57           ` [PATCH 5/6 v5] NFSD: New helper nfs4_get_stateowner() for atomic_inc sop reference Kinglong Mee
2014-08-20  9:59           ` [PATCH 6/6 v5] NFSD: Get reference of lockowner when coping file_lock Kinglong Mee

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53E792CD.9080503@gmail.com \
    --to=kinglongmee@gmail.com \
    --cc=bfields@fieldses.org \
    --cc=jeff.layton@primarydata.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trond.myklebust@primarydata.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).