diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /fs/nfs/pagelist.c | |
parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfs/pagelist.c')
-rw-r--r-- | fs/nfs/pagelist.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index b68536cc9046..e1164e3f9e69 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -26,12 +26,9 @@ static struct kmem_cache *nfs_page_cachep; | |||
26 | static inline struct nfs_page * | 26 | static inline struct nfs_page * |
27 | nfs_page_alloc(void) | 27 | nfs_page_alloc(void) |
28 | { | 28 | { |
29 | struct nfs_page *p; | 29 | struct nfs_page *p = kmem_cache_zalloc(nfs_page_cachep, GFP_KERNEL); |
30 | p = kmem_cache_alloc(nfs_page_cachep, GFP_KERNEL); | 30 | if (p) |
31 | if (p) { | ||
32 | memset(p, 0, sizeof(*p)); | ||
33 | INIT_LIST_HEAD(&p->wb_list); | 31 | INIT_LIST_HEAD(&p->wb_list); |
34 | } | ||
35 | return p; | 32 | return p; |
36 | } | 33 | } |
37 | 34 | ||