---

yaml --- r: 311189 b: refs/heads/master c: 1a0de48 h: refs/heads/master i: 311187: e393b55 v: v3
git-mirror · Jun 19, 2012 · 7b4becd · 7b4becd
1 parent 5923365
commit 7b4becd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a695da26367f53a368c90435e0b883c12f02791
+refs/heads/master: 1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22
diff --git a/trunk/fs/nfs/inode.c b/trunk/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);