diff options
author | Geliang Tang <geliangtang@163.com> | 2016-03-13 03:26:29 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2016-03-25 13:51:56 -0400 |
commit | 99ec269779f1fde25356e14299419551cdb54443 (patch) | |
tree | 7c440ee9ddd489d406174875a2aad9c8f4452cb1 | |
parent | 03d9440676163e965cb77d03c102b461d8ccb482 (diff) |
ceph: use kmem_cache_zalloc
Use kmem_cache_zalloc() instead of kmem_cache_alloc() with flag GFP_ZERO.
Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-rw-r--r-- | fs/ceph/dir.c | 2 | ||||
-rw-r--r-- | fs/ceph/file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index d6c13f9c9317..fadc243dfb28 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c | |||
@@ -38,7 +38,7 @@ int ceph_init_dentry(struct dentry *dentry) | |||
38 | if (dentry->d_fsdata) | 38 | if (dentry->d_fsdata) |
39 | return 0; | 39 | return 0; |
40 | 40 | ||
41 | di = kmem_cache_alloc(ceph_dentry_cachep, GFP_KERNEL | __GFP_ZERO); | 41 | di = kmem_cache_zalloc(ceph_dentry_cachep, GFP_KERNEL); |
42 | if (!di) | 42 | if (!di) |
43 | return -ENOMEM; /* oh well */ | 43 | return -ENOMEM; /* oh well */ |
44 | 44 | ||
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 334a75170a3b..ef38f01c1795 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c | |||
@@ -157,7 +157,7 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode) | |||
157 | case S_IFDIR: | 157 | case S_IFDIR: |
158 | dout("init_file %p %p 0%o (regular)\n", inode, file, | 158 | dout("init_file %p %p 0%o (regular)\n", inode, file, |
159 | inode->i_mode); | 159 | inode->i_mode); |
160 | cf = kmem_cache_alloc(ceph_file_cachep, GFP_KERNEL | __GFP_ZERO); | 160 | cf = kmem_cache_zalloc(ceph_file_cachep, GFP_KERNEL); |
161 | if (cf == NULL) { | 161 | if (cf == NULL) { |
162 | ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */ | 162 | ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */ |
163 | return -ENOMEM; | 163 | return -ENOMEM; |