diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:23 -0500 |
commit | e6b4f8da3a88457148038bc952043e99a7fdba64 (patch) | |
tree | 858c2a0e04b442395e7ecd0f60c8d2a3304b83e1 /fs/nfs | |
parent | 55acbda0965ca0a29b0ca276e7d17a55edc11d1b (diff) |
[PATCH] slab: remove SLAB_NOFS
SLAB_NOFS is an alias of GFP_NOFS.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/read.c | 2 | ||||
-rw-r--r-- | fs/nfs/write.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index c2e49c397a27..56f66f0ccb6a 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -46,7 +46,7 @@ static mempool_t *nfs_rdata_mempool; | |||
46 | struct nfs_read_data *nfs_readdata_alloc(size_t len) | 46 | struct nfs_read_data *nfs_readdata_alloc(size_t len) |
47 | { | 47 | { |
48 | unsigned int pagecount = (len + PAGE_SIZE - 1) >> PAGE_SHIFT; | 48 | unsigned int pagecount = (len + PAGE_SIZE - 1) >> PAGE_SHIFT; |
49 | struct nfs_read_data *p = mempool_alloc(nfs_rdata_mempool, SLAB_NOFS); | 49 | struct nfs_read_data *p = mempool_alloc(nfs_rdata_mempool, GFP_NOFS); |
50 | 50 | ||
51 | if (p) { | 51 | if (p) { |
52 | memset(p, 0, sizeof(*p)); | 52 | memset(p, 0, sizeof(*p)); |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 883dd4a1c157..f7dd0d005957 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -93,7 +93,7 @@ static DECLARE_WAIT_QUEUE_HEAD(nfs_write_congestion); | |||
93 | 93 | ||
94 | struct nfs_write_data *nfs_commit_alloc(void) | 94 | struct nfs_write_data *nfs_commit_alloc(void) |
95 | { | 95 | { |
96 | struct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, SLAB_NOFS); | 96 | struct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, GFP_NOFS); |
97 | 97 | ||
98 | if (p) { | 98 | if (p) { |
99 | memset(p, 0, sizeof(*p)); | 99 | memset(p, 0, sizeof(*p)); |
@@ -112,7 +112,7 @@ void nfs_commit_free(struct nfs_write_data *p) | |||
112 | struct nfs_write_data *nfs_writedata_alloc(size_t len) | 112 | struct nfs_write_data *nfs_writedata_alloc(size_t len) |
113 | { | 113 | { |
114 | unsigned int pagecount = (len + PAGE_SIZE - 1) >> PAGE_SHIFT; | 114 | unsigned int pagecount = (len + PAGE_SIZE - 1) >> PAGE_SHIFT; |
115 | struct nfs_write_data *p = mempool_alloc(nfs_wdata_mempool, SLAB_NOFS); | 115 | struct nfs_write_data *p = mempool_alloc(nfs_wdata_mempool, GFP_NOFS); |
116 | 116 | ||
117 | if (p) { | 117 | if (p) { |
118 | memset(p, 0, sizeof(*p)); | 118 | memset(p, 0, sizeof(*p)); |