From: Trond Myklebust <trond.myklebust@primarydata.com>
To: stable@vger.kernel.org
Cc: Weston Andros Adamson <dros@primarydata.com>, linux-nfs@vger.kernel.org
Subject: [PATCH 06/14] pnfs: add pnfs_put_lseg_async
Date: Mon, 15 Sep 2014 14:14:37 -0400 [thread overview]
Message-ID: <1410804885-17228-7-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1410804885-17228-6-git-send-email-trond.myklebust@primarydata.com>
From: Weston Andros Adamson <dros@primarydata.com>
commit e6cf82d1830f5e16a10d566f58db70f297ba5da8 upstream.
This is useful when lsegs need to be released while holding locks.
Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/pnfs.c | 17 +++++++++++++++++
fs/nfs/pnfs.h | 7 +++++++
2 files changed, 24 insertions(+)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index ecbed4632d11..5f3eb3df7c59 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -361,6 +361,23 @@ pnfs_put_lseg(struct pnfs_layout_segment *lseg)
}
EXPORT_SYMBOL_GPL(pnfs_put_lseg);
+static void pnfs_put_lseg_async_work(struct work_struct *work)
+{
+ struct pnfs_layout_segment *lseg;
+
+ lseg = container_of(work, struct pnfs_layout_segment, pls_work);
+
+ pnfs_put_lseg(lseg);
+}
+
+void
+pnfs_put_lseg_async(struct pnfs_layout_segment *lseg)
+{
+ INIT_WORK(&lseg->pls_work, pnfs_put_lseg_async_work);
+ schedule_work(&lseg->pls_work);
+}
+EXPORT_SYMBOL_GPL(pnfs_put_lseg_async);
+
static u64
end_offset(u64 start, u64 len)
{
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index a4a58be94064..ae22a9ccc1b9 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -32,6 +32,7 @@
#include <linux/nfs_fs.h>
#include <linux/nfs_page.h>
+#include <linux/workqueue.h>
enum {
NFS_LSEG_VALID = 0, /* cleared when lseg is recalled/returned */
@@ -46,6 +47,7 @@ struct pnfs_layout_segment {
atomic_t pls_refcount;
unsigned long pls_flags;
struct pnfs_layout_hdr *pls_layout;
+ struct work_struct pls_work;
};
enum pnfs_try_status {
@@ -179,6 +181,7 @@ extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp);
/* pnfs.c */
void pnfs_get_layout_hdr(struct pnfs_layout_hdr *lo);
void pnfs_put_lseg(struct pnfs_layout_segment *lseg);
+void pnfs_put_lseg_async(struct pnfs_layout_segment *lseg);
void set_pnfs_layoutdriver(struct nfs_server *, const struct nfs_fh *, u32);
void unset_pnfs_layoutdriver(struct nfs_server *);
@@ -410,6 +413,10 @@ static inline void pnfs_put_lseg(struct pnfs_layout_segment *lseg)
{
}
+static inline void pnfs_put_lseg_async(struct pnfs_layout_segment *lseg)
+{
+}
+
static inline int pnfs_return_layout(struct inode *ino)
{
return 0;
--
1.9.3
next prev parent reply other threads:[~2014-09-15 18:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 18:14 [PATCH 00/14] Stable fixes for NFS client read/write code in 3.16.x Trond Myklebust
2014-09-15 18:14 ` [PATCH 01/14] nfs: move nfs_pgio_data and remove nfs_rw_header Trond Myklebust
2014-09-15 18:14 ` [PATCH 02/14] nfs: rename members of nfs_pgio_data Trond Myklebust
2014-09-15 18:14 ` [PATCH 03/14] nfs: merge nfs_pgio_data into _header Trond Myklebust
2014-09-15 18:14 ` [PATCH 04/14] nfs: remove pgio_header refcount, related cleanup Trond Myklebust
2014-09-15 18:14 ` [PATCH 05/14] nfs: check wait_on_bit_lock err in page_group_lock Trond Myklebust
2014-09-15 18:14 ` Trond Myklebust [this message]
2014-09-15 18:14 ` [PATCH 07/14] nfs: clear_request_commit while holding i_lock Trond Myklebust
2014-09-15 18:14 ` [PATCH 08/14] nfs: change nfs_page_group_lock argument Trond Myklebust
2014-09-15 18:14 ` [PATCH 09/14] nfs: fix nonblocking calls to nfs_page_group_lock Trond Myklebust
2014-09-15 18:14 ` [PATCH 10/14] nfs: use blocking page_group_lock in add_request Trond Myklebust
2014-09-15 18:14 ` [PATCH 11/14] nfs: fix error handling in lock_and_join_requests Trond Myklebust
2014-09-15 18:14 ` [PATCH 12/14] nfs: don't sleep with inode lock " Trond Myklebust
2014-09-15 18:14 ` [PATCH 13/14] nfs: disallow duplicate pages in pgio page vectors Trond Myklebust
2014-09-15 18:14 ` [PATCH 14/14] nfs: can_coalesce_requests must enforce contiguity Trond Myklebust
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=1410804885-17228-7-git-send-email-trond.myklebust@primarydata.com \
--to=trond.myklebust@primarydata.com \
--cc=dros@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
--cc=stable@vger.kernel.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: 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).