From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 19 Jun 2012 22:38:56 +0000 (-0400)
Subject: NFS: Initialise commit_info.rpc_out when !defined(CONFIG_NFS_V4)
X-Git-Tag: upstream/snapshot3+hdmi~7187^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

NFS: Initialise commit_info.rpc_out when !defined(CONFIG_NFS_V4)

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>
---

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index e605d69..f729698 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1530,7 +1530,6 @@ static inline void nfs4_init_once(struct nfs_inode *nfsi)
 	nfsi->delegation_state = 0;
 	init_rwsem(&nfsi->rwsem);
 	nfsi->layout = NULL;
-	atomic_set(&nfsi->commit_info.rpcs_out, 0);
 #endif
 }
 
@@ -1545,6 +1544,7 @@ static void init_once(void *foo)
 	INIT_LIST_HEAD(&nfsi->commit_info.list);
 	nfsi->npages = 0;
 	nfsi->commit_info.ncommit = 0;
+	atomic_set(&nfsi->commit_info.rpcs_out, 0);
 	atomic_set(&nfsi->silly_count, 1);
 	INIT_HLIST_HEAD(&nfsi->silly_list);
 	init_waitqueue_head(&nfsi->waitqueue);