summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2011-02-28 17:03:56 +0530
committerEric Van Hensbergen <ericvh@gmail.com>2011-03-15 09:57:37 -0500
commit2efda7998bbc50589d28f18fddfb0c44d412128e (patch)
treeaf3d83d0370b8d39b024ff8dbd34051d466bfa2d
parent20656a49ef37d8f44ed1e0b47d132197f9628adc (diff)
downloadblackbird-op-linux-2efda7998bbc50589d28f18fddfb0c44d412128e.tar.gz
blackbird-op-linux-2efda7998bbc50589d28f18fddfb0c44d412128e.zip
fs/9p: [fscache] wait for page write in cached mode
We need to call fscache_wait_on_page_write in launder_page for fscache Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
-rw-r--r--fs/9p/cache.c11
-rw-r--r--fs/9p/cache.h16
-rw-r--r--fs/9p/vfs_addr.c2
3 files changed, 27 insertions, 2 deletions
diff --git a/fs/9p/cache.c b/fs/9p/cache.c
index 0dbe0d139ac2..610913d42a28 100644
--- a/fs/9p/cache.c
+++ b/fs/9p/cache.c
@@ -461,3 +461,14 @@ void __v9fs_readpage_to_fscache(struct inode *inode, struct page *page)
if (ret != 0)
v9fs_uncache_page(inode, page);
}
+
+/*
+ * wait for a page to complete writing to the cache
+ */
+void __v9fs_fscache_wait_on_page_write(struct inode *inode, struct page *page)
+{
+ const struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+ P9_DPRINTK(P9_DEBUG_FSC, "inode %p page %p", inode, page);
+ if (PageFsCache(page))
+ fscache_wait_on_page_write(vcookie->fscache, page);
+}
diff --git a/fs/9p/cache.h b/fs/9p/cache.h
index a94192bfaee8..ec16fcdc3a67 100644
--- a/fs/9p/cache.h
+++ b/fs/9p/cache.h
@@ -64,8 +64,8 @@ extern int __v9fs_readpages_from_fscache(struct inode *inode,
struct list_head *pages,
unsigned *nr_pages);
extern void __v9fs_readpage_to_fscache(struct inode *inode, struct page *page);
-
-
+extern void __v9fs_fscache_wait_on_page_write(struct inode *inode,
+ struct page *page);
/**
* v9fs_cache_register - Register v9fs file system with the cache
*/
@@ -131,6 +131,12 @@ static inline void v9fs_vcookie_set_qid(struct inode *inode,
spin_unlock(&vcookie->lock);
}
+static inline void v9fs_fscache_wait_on_page_write(struct inode *inode,
+ struct page *page)
+{
+ return __v9fs_fscache_wait_on_page_write(inode, page);
+}
+
#else /* CONFIG_9P_FSCACHE */
static inline int v9fs_cache_register(void)
@@ -172,5 +178,11 @@ static inline void v9fs_vcookie_set_qid(struct inode *inode,
struct p9_qid *qid)
{}
+static inline void v9fs_fscache_wait_on_page_write(struct inode *inode,
+ struct page *page)
+{
+ return;
+}
+
#endif /* CONFIG_9P_FSCACHE */
#endif /* _9P_CACHE_H */
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index b7f2a8e3863e..637bd703e28c 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -151,6 +151,8 @@ static void v9fs_invalidate_page(struct page *page, unsigned long offset)
static int v9fs_launder_page(struct page *page)
{
+ struct inode *inode = page->mapping->host;
+ v9fs_fscache_wait_on_page_write(inode, page);
return 0;
}
OpenPOWER on IntegriCloud