lkml.org 
[lkml]   [2009]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 1/4] reiser4: some changes from reiser4-2.6.31 patch
> from
> http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/
I'm sorry, I did not see half of this is already covered by
vfs-take-2add-set_page_dirty_notag.patch. With that part removed,
this patch is only cosmetics now.

---
fs/reiser4/carry.c | 2 +-
fs/reiser4/carry_ops.c | 2 +-
fs/reiser4/znode.h | 1 -
mm/filemap.c | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)

Index: linux/fs/reiser4/carry.c
===================================================================
--- linux.orig/fs/reiser4/carry.c
+++ linux/fs/reiser4/carry.c
@@ -1095,7 +1095,7 @@ static void fatal_carry_error(carry_leve
*
* This function itself only manages changes in carry structures and delegates
* all hard work (allocation of znode for new root, changes of parent and
- * sibling pointers to the reiser4_add_tree_root().
+ * sibling pointers) to the reiser4_add_tree_root().
*
* Locking: old tree root is locked by carry at this point. Fake znode is also
* locked.
Index: linux/fs/reiser4/carry_ops.c
===================================================================
--- linux.orig/fs/reiser4/carry_ops.c
+++ linux/fs/reiser4/carry_ops.c
@@ -2015,7 +2015,7 @@ static int carry_estimate_bitmaps(void)
int bytes;

bytes = capped_height() * (0 + /* bnode should be added, but
- * its is private to bitmap.c,
+ * it is private to bitmap.c,
* skip for now. */
2 * sizeof(jnode));
/* working and commit jnodes */
Index: linux/fs/reiser4/znode.h
===================================================================
--- linux.orig/fs/reiser4/znode.h
+++ linux/fs/reiser4/znode.h
@@ -18,7 +18,6 @@

#include <linux/types.h>
#include <linux/spinlock.h>
-#include <linux/semaphore.h>
#include <linux/pagemap.h> /* for PAGE_CACHE_SIZE */
#include <asm/atomic.h>

Index: linux/mm/filemap.c
===================================================================
--- linux.orig/mm/filemap.c
+++ linux/mm/filemap.c
@@ -800,7 +802,6 @@ repeat:
rcu_read_unlock();
return ret;
}
-EXPORT_SYMBOL(find_get_pages);

/**
* find_get_pages_contig - gang contiguous pagecache lookup
@@ -970,6 +971,7 @@ static void shrink_readahead_size_eio(st
{
ra->ra_pages /= 4;
}
+EXPORT_SYMBOL(find_get_pages);

/**
* do_generic_file_read - generic file read routine

\
 
 \ /
  Last update: 2009-11-29 12:31    [W:0.182 / U:0.480 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site