SOURCES: reiser4-for-2.6.22-2.patch - partialy updated for 2.6.23, ...
zbyniu
zbyniu at pld-linux.org
Tue Oct 9 21:47:05 CEST 2007
Author: zbyniu Date: Tue Oct 9 19:47:05 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- partialy updated for 2.6.23, NFY
---- Files affected:
SOURCES:
reiser4-for-2.6.22-2.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/reiser4-for-2.6.22-2.patch
diff -u SOURCES/reiser4-for-2.6.22-2.patch:1.1 SOURCES/reiser4-for-2.6.22-2.patch:1.2
--- SOURCES/reiser4-for-2.6.22-2.patch:1.1 Tue Aug 7 19:41:35 2007
+++ SOURCES/reiser4-for-2.6.22-2.patch Tue Oct 9 21:47:00 2007
@@ -14511,7 +14511,7 @@
+{
+ fq_slab = kmem_cache_create("fq",
+ sizeof(flush_queue_t),
-+ 0, SLAB_HWCACHE_ALIGN, NULL, NULL);
++ 0, SLAB_HWCACHE_ALIGN, NULL);
+ if (fq_slab == NULL)
+ return RETERR(-ENOMEM);
+ return 0;
@@ -15329,7 +15329,7 @@
diff -urN linux-2.6.22.orig/fs/reiser4/fsdata.c linux-2.6.22/fs/reiser4/fsdata.c
--- linux-2.6.22.orig/fs/reiser4/fsdata.c 1970-01-01 03:00:00.000000000 +0300
+++ linux-2.6.22/fs/reiser4/fsdata.c 2007-07-29 00:25:34.868694406 +0400
-@@ -0,0 +1,808 @@
+@@ -0,0 +1,803 @@
+/* Copyright 2001, 2002, 2003, 2004, 2005 by Hans Reiser, licensing governed by
+ * reiser4/README */
+
@@ -15339,7 +15339,6 @@
+
+/* cache or dir_cursors */
+static struct kmem_cache *d_cursor_cache;
-+static struct shrinker *d_cursor_shrinker;
+
+/* list of unused cursors */
+static LIST_HEAD(cursor_cache);
@@ -15385,6 +15384,11 @@
+ return d_cursor_unused;
+}
+
++static struct shrinker d_cursor_shrinker = {
++ .shrink = d_cursor_shrink,
++ .seeks = DEFAULT_SEEKS << 3,
++};
++
+/**
+ * reiser4_init_d_cursor - create d_cursor cache
+ *
@@ -15394,7 +15398,7 @@
+int reiser4_init_d_cursor(void)
+{
+ d_cursor_cache = kmem_cache_create("d_cursor", sizeof(dir_cursor), 0,
-+ SLAB_HWCACHE_ALIGN, NULL, NULL);
++ SLAB_HWCACHE_ALIGN, NULL);
+ if (d_cursor_cache == NULL)
+ return RETERR(-ENOMEM);
+
@@ -15405,13 +15409,7 @@
+ * assign higher "seeks" value to d_cursor cache, so that it will be
+ * shrunk only if system is really tight on memory.
+ */
-+ d_cursor_shrinker = set_shrinker(DEFAULT_SEEKS << 3,
-+ d_cursor_shrink);
-+ if (d_cursor_shrinker == NULL) {
-+ destroy_reiser4_cache(&d_cursor_cache);
-+ d_cursor_cache = NULL;
-+ return RETERR(-ENOMEM);
-+ }
++ register_shrinker(&d_cursor_shrinker);
+ return 0;
+}
+
@@ -15422,10 +15420,7 @@
+ */
+void reiser4_done_d_cursor(void)
+{
-+ BUG_ON(d_cursor_shrinker == NULL);
-+ remove_shrinker(d_cursor_shrinker);
-+ d_cursor_shrinker = NULL;
-+
++ unregister_shrinker(&d_cursor_shrinker);
+ destroy_reiser4_cache(&d_cursor_cache);
+}
+
@@ -15944,7 +15939,7 @@
+ sizeof(struct reiser4_dentry_fsdata),
+ 0,
+ SLAB_HWCACHE_ALIGN |
-+ SLAB_RECLAIM_ACCOUNT, NULL,
++ SLAB_RECLAIM_ACCOUNT,
+ NULL);
+ if (dentry_fsdata_cache == NULL)
+ return RETERR(-ENOMEM);
@@ -16012,7 +16007,7 @@
+ sizeof(reiser4_file_fsdata),
+ 0,
+ SLAB_HWCACHE_ALIGN |
-+ SLAB_RECLAIM_ACCOUNT, NULL, NULL);
++ SLAB_RECLAIM_ACCOUNT, NULL);
+ if (file_fsdata_cache == NULL)
+ return RETERR(-ENOMEM);
+ return 0;
@@ -18532,7 +18527,7 @@
+
+ _jnode_slab = kmem_cache_create("jnode", sizeof(jnode), 0,
+ SLAB_HWCACHE_ALIGN |
-+ SLAB_RECLAIM_ACCOUNT, NULL, NULL);
++ SLAB_RECLAIM_ACCOUNT, NULL);
+ if (_jnode_slab == NULL)
+ return RETERR(-ENOMEM);
+
@@ -58479,7 +58474,7 @@
+ .open = open_unix_file,
+ .release = release_unix_file,
+ .fsync = sync_unix_file,
-+ .sendfile = sendfile_unix_file
++ .splice_read = sendfile_unix_file
+ },
+ .as_ops = {
+ .writepage = reiser4_writepage,
@@ -58686,7 +58681,7 @@
+ .mmap = prot_mmap_cryptcompress,
+ .release = prot_release_cryptcompress,
+ .fsync = reiser4_sync_common,
-+ .sendfile = prot_sendfile_cryptcompress
++ .splice_read = prot_sendfile_cryptcompress
+ },
+ .as_ops = {
+ .writepage = reiser4_writepage,
@@ -60979,7 +60974,7 @@
+ plugin_set_slab = kmem_cache_create("plugin_set",
+ sizeof(plugin_set), 0,
+ SLAB_HWCACHE_ALIGN,
-+ NULL, NULL);
++ NULL);
+ if (plugin_set_slab == NULL)
+ result = RETERR(-ENOMEM);
+ }
@@ -66754,7 +66749,7 @@
diff -urN linux-2.6.22.orig/fs/reiser4/super.h linux-2.6.22/fs/reiser4/super.h
--- linux-2.6.22.orig/fs/reiser4/super.h 1970-01-01 03:00:00.000000000 +0300
+++ linux-2.6.22/fs/reiser4/super.h 2007-07-29 00:25:35.020733749 +0400
-@@ -0,0 +1,464 @@
+@@ -0,0 +1,465 @@
+/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by
+ * reiser4/README */
+
@@ -66763,6 +66758,7 @@
+#if !defined( __REISER4_SUPER_H__ )
+#define __REISER4_SUPER_H__
+
++#include <linux/exportfs.h>
+#include "tree.h"
+#include "entd.h"
+#include "wander.h"
@@ -67288,7 +67284,7 @@
+ sizeof(struct reiser4_inode_object),
+ 0,
+ SLAB_HWCACHE_ALIGN |
-+ SLAB_RECLAIM_ACCOUNT, init_once, NULL);
++ SLAB_RECLAIM_ACCOUNT, init_once);
+ if (inode_cache == NULL)
+ return RETERR(-ENOMEM);
+ return 0;
@@ -72651,12 +72647,12 @@
+
+ _atom_slab = kmem_cache_create("txn_atom", sizeof(txn_atom), 0,
+ SLAB_HWCACHE_ALIGN |
-+ SLAB_RECLAIM_ACCOUNT, NULL, NULL);
++ SLAB_RECLAIM_ACCOUNT, NULL);
+ if (_atom_slab == NULL)
+ return RETERR(-ENOMEM);
+
+ _txnh_slab = kmem_cache_create("txn_handle", sizeof(txn_handle), 0,
-+ SLAB_HWCACHE_ALIGN, NULL, NULL);
++ SLAB_HWCACHE_ALIGN, NULL);
+ if (_txnh_slab == NULL) {
+ kmem_cache_destroy(_atom_slab);
+ _atom_slab = NULL;
@@ -79044,7 +79040,7 @@
+{
+ znode_cache = kmem_cache_create("znode", sizeof(znode), 0,
+ SLAB_HWCACHE_ALIGN |
-+ SLAB_RECLAIM_ACCOUNT, NULL, NULL);
++ SLAB_RECLAIM_ACCOUNT, NULL);
+ if (znode_cache == NULL)
+ return RETERR(-ENOMEM);
+
@@ -80320,17 +80316,6 @@
extern int filemap_fdatawrite(struct address_space *);
extern int filemap_flush(struct address_space *);
extern int filemap_fdatawait(struct address_space *);
-diff -urN linux-2.6.22.orig/lib/radix-tree.c linux-2.6.22/lib/radix-tree.c
---- linux-2.6.22.orig/lib/radix-tree.c 2007-07-21 00:33:01.265543326 +0400
-+++ linux-2.6.22/lib/radix-tree.c 2007-07-29 00:25:35.060744102 +0400
-@@ -151,6 +151,7 @@
- out:
- return ret;
- }
-+EXPORT_SYMBOL(radix_tree_preload);
-
- static inline void tag_set(struct radix_tree_node *node, unsigned int tag,
- int offset)
diff -urN linux-2.6.22.orig/mm/filemap.c linux-2.6.22/mm/filemap.c
--- linux-2.6.22.orig/mm/filemap.c 2007-07-21 00:33:01.277546443 +0400
+++ linux-2.6.22/mm/filemap.c 2007-07-29 00:25:35.064745138 +0400
@@ -80366,14 +80351,3 @@
/**
* do_generic_mapping_read - generic file read routine
-diff -urN linux-2.6.22.orig/mm/readahead.c linux-2.6.22/mm/readahead.c
---- linux-2.6.22.orig/mm/readahead.c 2007-07-21 00:33:01.305553717 +0400
-+++ linux-2.6.22/mm/readahead.c 2007-07-29 00:25:35.064745138 +0400
-@@ -571,6 +571,7 @@
- ra->flags &= ~RA_FLAG_INCACHE;
- ra->cache_hit = 0;
- }
-+EXPORT_SYMBOL_GPL(handle_ra_miss);
-
- /*
- * Given a desired number of PAGE_CACHE_SIZE readahead pages, return a
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/reiser4-for-2.6.22-2.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list