From: Kinglong Mee <kinglongmee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Jeff Layton <jeff.layton-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org> Cc: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>, Linux NFS Mailing List <linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, Trond Myklebust <trond.myklebust-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kinglongmee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Subject: [PATCH 2/6 v5] locks: Rename __locks_copy_lock() to locks_copy_conflock() Date: Wed, 20 Aug 2014 17:53:10 +0800 [thread overview] Message-ID: <53F47006.1090005@gmail.com> (raw) In-Reply-To: <53F36CB5.2030707-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Jeff advice, " Right now __locks_copy_lock is only used to copy conflocks. It would be good to rename that to something more distinct (i.e.locks_copy_conflock), to make it clear that we're generating a conflock there." v5: change order from 3/6 to 2/6 v4: new patch only renaming function name Signed-off-by: Kinglong Mee <kinglongmee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- fs/locks.c | 10 +++++----- include/linux/fs.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index cb66fb0..49ce390 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -281,7 +281,7 @@ static void locks_copy_private(struct file_lock *new, struct file_lock *fl) /* * Initialize a new lock from an existing file_lock structure. */ -void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl) +void locks_copy_conflock(struct file_lock *new, struct file_lock *fl) { new->fl_owner = fl->fl_owner; new->fl_pid = fl->fl_pid; @@ -293,14 +293,14 @@ void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl) new->fl_ops = NULL; new->fl_lmops = NULL; } -EXPORT_SYMBOL(__locks_copy_lock); +EXPORT_SYMBOL(locks_copy_conflock); void locks_copy_lock(struct file_lock *new, struct file_lock *fl) { /* "new" must be a freshly-initialized lock */ WARN_ON_ONCE(new->fl_ops); - __locks_copy_lock(new, fl); + locks_copy_conflock(new, fl); new->fl_file = fl->fl_file; new->fl_ops = fl->fl_ops; new->fl_lmops = fl->fl_lmops; @@ -735,7 +735,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl) break; } if (cfl) { - __locks_copy_lock(fl, cfl); + locks_copy_conflock(fl, cfl); if (cfl->fl_nspid) fl->fl_pid = pid_vnr(cfl->fl_nspid); } else @@ -941,7 +941,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str if (!posix_locks_conflict(request, fl)) continue; if (conflock) - __locks_copy_lock(conflock, fl); + locks_copy_conflock(conflock, fl); error = -EAGAIN; if (!(request->fl_flags & FL_SLEEP)) goto out; diff --git a/include/linux/fs.h b/include/linux/fs.h index 908af4f..5ab86f4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -966,7 +966,7 @@ void locks_free_lock(struct file_lock *fl); extern void locks_init_lock(struct file_lock *); extern struct file_lock * locks_alloc_lock(void); extern void locks_copy_lock(struct file_lock *, struct file_lock *); -extern void __locks_copy_lock(struct file_lock *, const struct file_lock *); +extern void locks_copy_conflock(struct file_lock *, struct file_lock *); extern void locks_remove_posix(struct file *, fl_owner_t); extern void locks_remove_file(struct file *); extern void locks_release_private(struct file_lock *); @@ -1026,7 +1026,7 @@ static inline void locks_init_lock(struct file_lock *fl) return; } -static inline void __locks_copy_lock(struct file_lock *new, struct file_lock *fl) +static inline void locks_copy_conflock(struct file_lock *new, struct file_lock *fl) { return; } -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
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/6 v5] locks: Rename __locks_copy_lock() to locks_copy_conflock() Date: Wed, 20 Aug 2014 17:53:10 +0800 [thread overview] Message-ID: <53F47006.1090005@gmail.com> (raw) In-Reply-To: <53F36CB5.2030707@gmail.com> Jeff advice, " Right now __locks_copy_lock is only used to copy conflocks. It would be good to rename that to something more distinct (i.e.locks_copy_conflock), to make it clear that we're generating a conflock there." v5: change order from 3/6 to 2/6 v4: new patch only renaming function name Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> --- fs/locks.c | 10 +++++----- include/linux/fs.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index cb66fb0..49ce390 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -281,7 +281,7 @@ static void locks_copy_private(struct file_lock *new, struct file_lock *fl) /* * Initialize a new lock from an existing file_lock structure. */ -void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl) +void locks_copy_conflock(struct file_lock *new, struct file_lock *fl) { new->fl_owner = fl->fl_owner; new->fl_pid = fl->fl_pid; @@ -293,14 +293,14 @@ void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl) new->fl_ops = NULL; new->fl_lmops = NULL; } -EXPORT_SYMBOL(__locks_copy_lock); +EXPORT_SYMBOL(locks_copy_conflock); void locks_copy_lock(struct file_lock *new, struct file_lock *fl) { /* "new" must be a freshly-initialized lock */ WARN_ON_ONCE(new->fl_ops); - __locks_copy_lock(new, fl); + locks_copy_conflock(new, fl); new->fl_file = fl->fl_file; new->fl_ops = fl->fl_ops; new->fl_lmops = fl->fl_lmops; @@ -735,7 +735,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl) break; } if (cfl) { - __locks_copy_lock(fl, cfl); + locks_copy_conflock(fl, cfl); if (cfl->fl_nspid) fl->fl_pid = pid_vnr(cfl->fl_nspid); } else @@ -941,7 +941,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str if (!posix_locks_conflict(request, fl)) continue; if (conflock) - __locks_copy_lock(conflock, fl); + locks_copy_conflock(conflock, fl); error = -EAGAIN; if (!(request->fl_flags & FL_SLEEP)) goto out; diff --git a/include/linux/fs.h b/include/linux/fs.h index 908af4f..5ab86f4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -966,7 +966,7 @@ void locks_free_lock(struct file_lock *fl); extern void locks_init_lock(struct file_lock *); extern struct file_lock * locks_alloc_lock(void); extern void locks_copy_lock(struct file_lock *, struct file_lock *); -extern void __locks_copy_lock(struct file_lock *, const struct file_lock *); +extern void locks_copy_conflock(struct file_lock *, struct file_lock *); extern void locks_remove_posix(struct file *, fl_owner_t); extern void locks_remove_file(struct file *); extern void locks_release_private(struct file_lock *); @@ -1026,7 +1026,7 @@ static inline void locks_init_lock(struct file_lock *fl) return; } -static inline void __locks_copy_lock(struct file_lock *new, struct file_lock *fl) +static inline void locks_copy_conflock(struct file_lock *new, struct file_lock *fl) { return; } -- 1.9.3
next prev parent reply other threads:[~2014-08-20 9:53 UTC|newest] Thread overview: 102+ 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 [not found] ` <53DCF97D.3000605-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-02 23:05 ` Jeff Layton 2014-08-02 23:05 ` Jeff Layton [not found] ` <20140802190505.442f07b8-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-05 19:14 ` J. Bruce Fields 2014-08-05 19:14 ` J. Bruce Fields [not found] ` <20140805191458.GV23341-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> 2014-08-05 19:20 ` Jeff Layton 2014-08-05 19:20 ` Jeff Layton [not found] ` <53BAAAC5.9000106-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 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:33 ` Kinglong Mee [not found] ` <53E22EA5.70708-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-06 13:35 ` [PATCH 2/3] NFSD: Increase the reference of lockowner when coping file_lock Kinglong Mee 2014-08-06 13:35 ` Kinglong Mee [not found] ` <53E22F2C.8070900-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-06 13:38 ` [PATCH 3/3 RFC] fs/locks.c: Copy all infomation for conflock Kinglong Mee 2014-08-06 13:38 ` Kinglong Mee 2014-08-09 11:08 ` [PATCH 2/3] NFSD: Increase the reference of lockowner when coping file_lock Jeff Layton 2014-08-09 11:08 ` Jeff Layton [not found] ` <20140809070818.4d939a6a-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-10 15:47 ` Kinglong Mee 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 [not found] ` <20140809065112.700e0ecc-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-10 12:46 ` Kinglong Mee 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:38 ` Kinglong Mee 2014-08-15 0:07 ` [PATCH 2/5 v3] locks: Copy all infomation " Kinglong Mee [not found] ` <53ED4F30.4060308-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-15 11:14 ` Jeff Layton 2014-08-15 11:14 ` Jeff Layton [not found] ` <20140815071450.498949d8-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-15 14:33 ` Kinglong Mee 2014-08-15 14:33 ` Kinglong Mee [not found] ` <53EE1A4E.1010707-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-16 13:35 ` Kinglong Mee 2014-08-16 13:35 ` Kinglong Mee [not found] ` <53EF5E35.5090501-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-17 13:42 ` Kinglong Mee 2014-08-17 13:42 ` Kinglong Mee [not found] ` <53F0B13D.2040700-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-18 11:54 ` Jeff Layton 2014-08-18 11:54 ` Jeff Layton 2014-08-19 15:10 ` Kinglong Mee 2014-08-15 0:10 ` [PATCH 4/5 v3] NFSD: New helper nfs4_get_stateowner() for atomic_inc reference Kinglong Mee [not found] ` <53E791F1.40802-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-10 15:42 ` [PATCH 2/3 v2] fs/locks.c: New ops in file_lock_operations for copying/releasing owner Kinglong Mee 2014-08-10 15:42 ` Kinglong Mee 2014-08-10 15:43 ` [PATCH 3/3 v2] NFSD: Increase the reference of lockowner when coping file_lock Kinglong Mee 2014-08-10 15:43 ` Kinglong Mee [not found] ` <53E7933D.80504-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-11 16:46 ` Jeff Layton 2014-08-11 16:46 ` Jeff Layton [not found] ` <20140811124610.16f49168-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-14 12:30 ` Kinglong Mee 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:19 ` Jeff Layton [not found] ` <20140811121949.4c3d7894-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-11 16:25 ` Joe Perches 2014-08-11 16:25 ` Joe Perches 2014-08-14 12:59 ` Kinglong Mee 2014-08-14 12:59 ` Kinglong Mee 2014-08-14 12:26 ` Kinglong Mee 2014-08-14 12:26 ` Kinglong Mee 2014-08-14 14:00 ` Jeff Layton [not found] ` <20140814100025.2b2f72db-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-14 14:04 ` Kinglong Mee 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 0:02 ` Kinglong Mee [not found] ` <53ED4E2F.2010701-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-15 10:57 ` Jeff Layton 2014-08-15 10:57 ` Jeff Layton [not found] ` <20140815065741.42f18ec9-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-15 21:35 ` J. Bruce Fields 2014-08-15 21:35 ` J. Bruce Fields 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:09 ` 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-15 0:13 ` Kinglong Mee 2014-08-19 15:18 ` [PATCH 2/6 v4] locks: New ops in file_lock_operations for get/put owner Kinglong Mee [not found] ` <53F36AE2.7070507-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-19 19:42 ` Jeff Layton 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 [not found] ` <53ED5093.6000308-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-19 15:16 ` [PATCH 1/6 v4] NFSD: Remove the duplicate initialize of file_lock Kinglong Mee 2014-08-19 15:16 ` Kinglong Mee 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 15:24 ` 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-20 9:51 ` [PATCH 1/6 v5] NFSD: Remove the duplicate initialize of file_lock Kinglong Mee [not found] ` <53F36CB5.2030707-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-08-19 20:23 ` [PATCH 6/6 v4] NFSD: Increase the reference of lockowner when coping file_lock Jeff Layton 2014-08-19 20:23 ` Jeff Layton 2014-08-19 20:24 ` J. Bruce Fields [not found] ` <20140819162344.269953bd-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2014-08-20 10:02 ` Kinglong Mee 2014-08-20 10:02 ` Kinglong Mee 2014-08-20 9:53 ` Kinglong Mee [this message] 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:54 ` 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:57 ` Kinglong Mee 2014-08-20 9:59 ` [PATCH 6/6 v5] NFSD: Get reference of lockowner when coping file_lock Kinglong Mee 2014-08-20 9:59 ` Kinglong Mee 2014-08-20 9:56 ` [PATCH 4/6 v5] locks: Copy fl_lmops information for conflock in locks_copy_conflock() 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=53F47006.1090005@gmail.com \ --to=kinglongmee-re5jqeeqqe8avxtiumwx3w@public.gmane.org \ --cc=bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org \ --cc=jeff.layton-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org \ --cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=trond.myklebust-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.