[PATCH] fix2 to putback_lru_page()/unevictable page handlingrework v3
From: Lee Schermerhorn
Date: Tue Jun 24 2008 - 13:30:23 EST
PATCH revert shmem_lock() prototypes to return int
Against: 26-rc5-mm3 with Kosaki Motohiro's splitlru unevictable lru
fixes.
Fix to ïputback_lru_page()/unevictable page handling rework v3 patch.
The subject patch reverted a prior change to shmem_lock() to return a
struct address_space pointer back to returning an int. This patch
updates the prototypes in mm.h to match.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
include/linux/mm.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Index: linux-2.6.26-rc5-mm3/include/linux/mm.h
===================================================================
--- linux-2.6.26-rc5-mm3.orig/include/linux/mm.h 2008-06-24 12:54:41.000000000 -0400
+++ linux-2.6.26-rc5-mm3/include/linux/mm.h 2008-06-24 13:25:29.000000000 -0400
@@ -706,13 +706,12 @@ static inline int page_mapped(struct pag
extern void show_free_areas(void);
#ifdef CONFIG_SHMEM
-extern struct address_space *shmem_lock(struct file *file, int lock,
- struct user_struct *user);
+extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
#else
-static inline struct address_space *shmem_lock(struct file *file, int lock,
+static inline int shmem_lock(struct file *file, int lock,
struct user_struct *user)
{
- return NULL;
+ return 0;
}
#endif
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/