From a879ae8bef6f673a2c15244f4be17065424c8dc3 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 30 Apr 2012 18:31:49 -0400 Subject: [PATCH] --- yaml --- r: 308567 b: refs/heads/master c: 292f3eeef00a20fa0ef4feec62792ad0065760a0 h: refs/heads/master i: 308565: e3375d7b799430c44dd4d3a1c25d35103ca68b27 308563: 904a71b93000e8354952f1dc76b82be76c91abe6 308559: 32fa1d133f21d9a8e64e4335328c3789c9c532ec v: v3 --- [refs] | 2 +- trunk/fs/nfs/direct.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 318a40a8ddaa..0fa47d0e587a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d74743b088d116e31fe1b73f47e782ee2016b94 +refs/heads/master: 292f3eeef00a20fa0ef4feec62792ad0065760a0 diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c index 78d1ead8bc30..f17e4695c842 100644 --- a/trunk/fs/nfs/direct.c +++ b/trunk/fs/nfs/direct.c @@ -149,26 +149,16 @@ static inline struct nfs_direct_req *nfs_direct_req_alloc(void) { struct nfs_direct_req *dreq; - dreq = kmem_cache_alloc(nfs_direct_cachep, GFP_KERNEL); + dreq = kmem_cache_zalloc(nfs_direct_cachep, GFP_KERNEL); if (!dreq) return NULL; kref_init(&dreq->kref); kref_get(&dreq->kref); init_completion(&dreq->completion); - dreq->mds_cinfo.ncommit = 0; - atomic_set(&dreq->mds_cinfo.rpcs_out, 0); INIT_LIST_HEAD(&dreq->mds_cinfo.list); INIT_WORK(&dreq->work, nfs_direct_write_schedule_work); - memset(&dreq->ds_cinfo, 0, sizeof(dreq->ds_cinfo)); - dreq->iocb = NULL; - dreq->ctx = NULL; - dreq->l_ctx = NULL; spin_lock_init(&dreq->lock); - atomic_set(&dreq->io_count, 0); - dreq->count = 0; - dreq->error = 0; - dreq->flags = 0; return dreq; }