Skip to contentSkip to conversation

Cleancache: btrfs hooks for cleancache

PATCH New Dan Magenheimer 1 participant 1 message Sep 3, 2010

Subsystems (3)
Memory management Btrfs file system OCFS2
lore
Share & tools
lore

Dan Magenheimer

author
#0 lore raw

PATCH v5 6/8 Cleancache: btrfs hooks for cleancache

[PATCH V5 6/8] Cleancache: btrfs hooks for cleancache

Filesystems must explicitly enable cleancache by calling cleancache_init_fs anytime a instance of the filesystem is mounted and must save the returned poolid. Btrfs uses its own readpage which must be hooked, but all other cleancache hooks are in the VFS layer including the matching cleancache_flush_fs hook which must be called on unmount.

Signed-off-by Dan Magenheimer <[email protected]>
Signed-off-by Chris Mason <[email protected]>

Diffstat:

 extent_io.c                              |    9 +++++++++
 super.c                                  |    2 ++
 2 files changed, 11 insertions(+)
fs/btrfs/super.c +2 -0
@@ -39,6 +39,7 @@
 #include <linux/miscdevice.h>
 #include <linux/magic.h>
 #include <linux/slab.h>
+#include <linux/cleancache.h>
 #include "compat.h"
 #include "ctree.h"
 #include "disk-io.h"

@@ -479,6 +480,7 @@ static int btrfs_fill_super(struct super
 	sb->s_root = root_dentry;
 
 	save_mount_options(sb, data);
+	cleancache_init_fs(sb);
 	return 0;
 
 fail_close:
fs/btrfs/extent_io.c +9 -0
@@ -10,6 +10,7 @@
 #include <linux/swap.h>
 #include <linux/writeback.h>
 #include <linux/pagevec.h>
+#include <linux/cleancache.h>
 #include "extent_io.h"
 #include "extent_map.h"
 #include "compat.h"

@@ -2027,6 +2028,13 @@ static int __extent_read_full_page(struc
 
 	set_page_extent_mapped(page);
 
+	if (!PageUptodate(page)) {
+		if (cleancache_get_page(page) == 0) {
+			BUG_ON(blocksize != PAGE_SIZE);
+			goto out;
+		}
+	}
+
 	end = page_end;
 	while (1) {
 		lock_extent(tree, start, end, GFP_NOFS);

@@ -2151,6 +2159,7 @@ static int __extent_read_full_page(struc
 		cur = cur + iosize;
 		page_offset += iosize;
 	}
+out:
 	if (!nr) {
 		if (!PageError(page))
 			SetPageUptodate(page);