diff --git a/[refs] b/[refs] index 3695456364ad..01cf3b963c7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d8cb26d7dcb911f110b7762bd5941e8f009d6c3 +refs/heads/master: 36e21687e6e51c4225c42e6291938363f7bbfa7c diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c index 67bbb41d5526..6e4f43ff23ec 100644 --- a/trunk/fs/ceph/dir.c +++ b/trunk/fs/ceph/dir.c @@ -46,7 +46,7 @@ int ceph_init_dentry(struct dentry *dentry) else dentry->d_op = &ceph_snap_dentry_ops; - di = kmem_cache_alloc(ceph_dentry_cachep, GFP_NOFS); + di = kmem_cache_alloc(ceph_dentry_cachep, GFP_NOFS | __GFP_ZERO); if (!di) return -ENOMEM; /* oh well */