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 3/3 v2] NFSD: Increase the reference of lockowner when coping file_lock Date: Sun, 10 Aug 2014 23:43:57 +0800 [thread overview] Message-ID: <53E7933D.80504@gmail.com> (raw) In-Reply-To: <53E791F1.40802-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> v2: Fix bad using of struct file_lock_operations for handle the owner. Signed-off-by: Kinglong Mee <kinglongmee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- fs/nfsd/nfs4state.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 2e80a59..24a8d91 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4867,9 +4867,33 @@ nfs4_transform_lock_offset(struct file_lock *lock) lock->fl_end = OFFSET_MAX; } +static inline struct nfs4_lockowner *get_lockowner(struct nfs4_lockowner *lo) +{ + atomic_inc(&lo->lo_owner.so_count); + return lo; +} + +static void nfsd4_fl_copy_owner(struct file_lock *dst, struct file_lock *src) +{ + struct nfs4_lockowner *lo = (struct nfs4_lockowner *) src->fl_owner; + dst->fl_owner = (fl_owner_t) get_lockowner(lo); +} + +static void nfsd4_fl_release_owner(struct file_lock *fl) +{ + struct nfs4_lockowner *lo = (struct nfs4_lockowner *) fl->fl_owner; + + if (lo) { + nfs4_put_stateowner(&lo->lo_owner); + fl->fl_owner = NULL; + } +} + /* Hack!: For now, we're defining this just so we can use a pointer to it * as a unique cookie to identify our (NFSv4's) posix locks. */ static const struct lock_manager_operations nfsd_posix_mng_ops = { + .lm_copy_owner = nfsd4_fl_copy_owner, + .lm_release_owner = nfsd4_fl_release_owner, }; static inline void @@ -5238,7 +5262,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfserr_openmode; goto out; } - file_lock->fl_owner = (fl_owner_t)lock_sop; + + file_lock->fl_owner = (fl_owner_t)get_lockowner(lock_sop); file_lock->fl_pid = current->tgid; file_lock->fl_file = filp; file_lock->fl_flags = FL_POSIX; @@ -5405,6 +5430,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfs4_ol_stateid *stp; struct file *filp = NULL; struct file_lock *file_lock = NULL; + struct nfs4_lockowner *lock_sop = NULL; __be32 status; int err; struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); @@ -5426,6 +5452,8 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfserr_lock_range; goto put_stateid; } + + lock_sop = lockowner(stp->st_stateowner); file_lock = locks_alloc_lock(); if (!file_lock) { dprintk("NFSD: %s: unable to allocate lock!\n", __func__); @@ -5434,7 +5462,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, } locks_init_lock(file_lock); file_lock->fl_type = F_UNLCK; - file_lock->fl_owner = (fl_owner_t)lockowner(stp->st_stateowner); + file_lock->fl_owner = (fl_owner_t)get_lockowner(lock_sop); file_lock->fl_pid = current->tgid; file_lock->fl_file = filp; file_lock->fl_flags = FL_POSIX; -- 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 3/3 v2] NFSD: Increase the reference of lockowner when coping file_lock Date: Sun, 10 Aug 2014 23:43:57 +0800 [thread overview] Message-ID: <53E7933D.80504@gmail.com> (raw) In-Reply-To: <53E791F1.40802@gmail.com> v2: Fix bad using of struct file_lock_operations for handle the owner. Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> --- fs/nfsd/nfs4state.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 2e80a59..24a8d91 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4867,9 +4867,33 @@ nfs4_transform_lock_offset(struct file_lock *lock) lock->fl_end = OFFSET_MAX; } +static inline struct nfs4_lockowner *get_lockowner(struct nfs4_lockowner *lo) +{ + atomic_inc(&lo->lo_owner.so_count); + return lo; +} + +static void nfsd4_fl_copy_owner(struct file_lock *dst, struct file_lock *src) +{ + struct nfs4_lockowner *lo = (struct nfs4_lockowner *) src->fl_owner; + dst->fl_owner = (fl_owner_t) get_lockowner(lo); +} + +static void nfsd4_fl_release_owner(struct file_lock *fl) +{ + struct nfs4_lockowner *lo = (struct nfs4_lockowner *) fl->fl_owner; + + if (lo) { + nfs4_put_stateowner(&lo->lo_owner); + fl->fl_owner = NULL; + } +} + /* Hack!: For now, we're defining this just so we can use a pointer to it * as a unique cookie to identify our (NFSv4's) posix locks. */ static const struct lock_manager_operations nfsd_posix_mng_ops = { + .lm_copy_owner = nfsd4_fl_copy_owner, + .lm_release_owner = nfsd4_fl_release_owner, }; static inline void @@ -5238,7 +5262,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfserr_openmode; goto out; } - file_lock->fl_owner = (fl_owner_t)lock_sop; + + file_lock->fl_owner = (fl_owner_t)get_lockowner(lock_sop); file_lock->fl_pid = current->tgid; file_lock->fl_file = filp; file_lock->fl_flags = FL_POSIX; @@ -5405,6 +5430,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfs4_ol_stateid *stp; struct file *filp = NULL; struct file_lock *file_lock = NULL; + struct nfs4_lockowner *lock_sop = NULL; __be32 status; int err; struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); @@ -5426,6 +5452,8 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfserr_lock_range; goto put_stateid; } + + lock_sop = lockowner(stp->st_stateowner); file_lock = locks_alloc_lock(); if (!file_lock) { dprintk("NFSD: %s: unable to allocate lock!\n", __func__); @@ -5434,7 +5462,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, } locks_init_lock(file_lock); file_lock->fl_type = F_UNLCK; - file_lock->fl_owner = (fl_owner_t)lockowner(stp->st_stateowner); + file_lock->fl_owner = (fl_owner_t)get_lockowner(lock_sop); file_lock->fl_pid = current->tgid; file_lock->fl_file = filp; file_lock->fl_flags = FL_POSIX; -- 1.9.3
next prev parent reply other threads:[~2014-08-10 15:43 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 ` 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 [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 ` [PATCH 2/6 v5] locks: Rename __locks_copy_lock() to locks_copy_conflock() Kinglong Mee 2014-08-20 9:53 ` 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=53E7933D.80504@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.