SOURCES (LINUX_2_6_11): reiser4-2.6.13-mm3.patch - cosmetics

[jpc]

Author: jpc                          Date: Thu Sep 15 23:31:34 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6_11
---- Log message:
- cosmetics

---- Files affected:
SOURCES:
   reiser4-2.6.13-mm3.patch (1.1 -> 1.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/reiser4-2.6.13-mm3.patch
diff -u SOURCES/reiser4-2.6.13-mm3.patch:1.1 SOURCES/reiser4-2.6.13-mm3.patch:1.1.4.1
--- SOURCES/reiser4-2.6.13-mm3.patch:1.1	Thu Sep 15 13:04:44 2005
+++ SOURCES/reiser4-2.6.13-mm3.patch	Fri Sep 16 01:31:29 2005
@@ -379,21 +379,22 @@
 diff -puN mm/truncate.c~reiser4-reget-page-mapping mm/truncate.c
 --- 25/mm/truncate.c~reiser4-reget-page-mapping	2005-06-22 21:58:18.000000000 -0700
 +++ 25-akpm/mm/truncate.c	2005-06-22 21:58:18.000000000 -0700
-@@ -76,6 +76,13 @@ invalidate_complete_page(struct address_
- 	if (PagePrivate(page) && !try_to_release_page(page, 0))
- 		return 0;
- 
-+	/*
-+	 * file system may manually remove page from the page
-+	 * cache in ->releasepage(). Check for this.
-+	 */
-+	if (page->mapping != mapping)
-+		return 0;
+d@@ -76,6 +76,14 @@
+        if (PagePrivate(page) && !try_to_release_page(page, 0))
+                return 0;
+
++       /*
++        * file system may manually remove page from the page
++        * cache in ->releasepage(). Check for this.
++        */
++       if (page->mapping != mapping)
++               return 0;
++
 +
- 	write_lock_irq(&mapping->tree_lock);
- 	if (PageDirty(page)) {
- 		write_unlock_irq(&mapping->tree_lock);
-diff -puN mm/vmscan.c~reiser4-reget-page-mapping mm/vmscan.c
+        spin_lock_irq(&mapping->tree_lock);
+        if (PageDirty(page)) {
+                spin_unlock_irq(&mapping->tree_lock);
+iff -puN mm/vmscan.c~reiser4-reget-page-mapping mm/vmscan.c
 --- 25/mm/vmscan.c~reiser4-reget-page-mapping	2005-06-22 21:58:18.000000000 -0700
 +++ 25-akpm/mm/vmscan.c	2005-06-22 21:58:18.000000000 -0700
 @@ -497,6 +497,11 @@ static int shrink_list(struct list_head 
@@ -443,12 +444,12 @@
  };
  
  DECLARE_PER_CPU(struct rcu_data, rcu_data);
-@@ -283,6 +284,7 @@ extern void FASTCALL(call_rcu_bh(struct 
- extern __deprecated_for_modules void synchronize_kernel(void);
- extern void synchronize_rcu(void);
- void synchronize_idle(void);
+@@ -267,6 +267,7 @@
+ extern void FASTCALL(call_rcu_bh(struct rcu_head *head,
+                                void (*func)(struct rcu_head *head)));
+ extern void synchronize_kernel(void);
 +extern void rcu_barrier(void);
- 
+
  #endif /* __KERNEL__ */
  #endif /* __LINUX_RCUPDATE_H */
 diff -puN kernel/rcupdate.c~reiser4-rcu-barrier kernel/rcupdate.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/reiser4-2.6.13-mm3.patch?r1=1.1&r2=1.1.4.1&f=u