git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
[pandora-kernel.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_buf.c
diff --git
a/fs/xfs/linux-2.6/xfs_buf.c
b/fs/xfs/linux-2.6/xfs_buf.c
index
a36a8e3
..
26fed07
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_buf.c
+++ b/
fs/xfs/linux-2.6/xfs_buf.c
@@
-29,6
+29,7
@@
#include <linux/blkdev.h>
#include <linux/hash.h>
#include <linux/kthread.h>
#include <linux/blkdev.h>
#include <linux/hash.h>
#include <linux/kthread.h>
+#include <linux/migrate.h>
#include "xfs_linux.h"
STATIC kmem_zone_t *xfs_buf_zone;
#include "xfs_linux.h"
STATIC kmem_zone_t *xfs_buf_zone;
@@
-181,7
+182,7
@@
free_address(
{
a_list_t *aentry;
{
a_list_t *aentry;
- aentry = kmalloc(sizeof(a_list_t), GFP_
ATOMIC & ~__GFP_HIGH
);
+ aentry = kmalloc(sizeof(a_list_t), GFP_
NOWAIT
);
if (likely(aentry)) {
spin_lock(&as_lock);
aentry->next = as_free_head;
if (likely(aentry)) {
spin_lock(&as_lock);
aentry->next = as_free_head;
@@
-1521,6
+1522,7
@@
xfs_mapping_buftarg(
struct address_space *mapping;
static struct address_space_operations mapping_aops = {
.sync_page = block_sync_page,
struct address_space *mapping;
static struct address_space_operations mapping_aops = {
.sync_page = block_sync_page,
+ .migratepage = fail_migrate_page,
};
inode = new_inode(bdev->bd_inode->i_sb);
};
inode = new_inode(bdev->bd_inode->i_sb);
@@
-1804,13
+1806,12
@@
xfs_flush_buftarg(
int __init
xfs_buf_init(void)
{
int __init
xfs_buf_init(void)
{
- int error = -ENOMEM;
-
#ifdef XFS_BUF_TRACE
xfs_buf_trace_buf = ktrace_alloc(XFS_BUF_TRACE_SIZE, KM_SLEEP);
#endif
#ifdef XFS_BUF_TRACE
xfs_buf_trace_buf = ktrace_alloc(XFS_BUF_TRACE_SIZE, KM_SLEEP);
#endif
- xfs_buf_zone = kmem_zone_init(sizeof(xfs_buf_t), "xfs_buf");
+ xfs_buf_zone = kmem_zone_init_flags(sizeof(xfs_buf_t), "xfs_buf",
+ KM_ZONE_HWALIGN, NULL);
if (!xfs_buf_zone)
goto out_free_trace_buf;
if (!xfs_buf_zone)
goto out_free_trace_buf;
@@
-1838,7
+1839,7
@@
xfs_buf_init(void)
#ifdef XFS_BUF_TRACE
ktrace_free(xfs_buf_trace_buf);
#endif
#ifdef XFS_BUF_TRACE
ktrace_free(xfs_buf_trace_buf);
#endif
- return
error
;
+ return
-ENOMEM
;
}
void
}
void