Bläddra i källkod

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>
Trond Myklebust 13 år sedan
förälder
incheckning
1a0de48ae5
1 ändrade filer med 1 tillägg och 1 borttagningar
  1. 1 1
      fs/nfs/inode.c

+ 1 - 1
fs/nfs/inode.c

@@ -1530,7 +1530,6 @@ static inline void nfs4_init_once(struct nfs_inode *nfsi)
 	nfsi->delegation_state = 0;
 	nfsi->delegation_state = 0;
 	init_rwsem(&nfsi->rwsem);
 	init_rwsem(&nfsi->rwsem);
 	nfsi->layout = NULL;
 	nfsi->layout = NULL;
-	atomic_set(&nfsi->commit_info.rpcs_out, 0);
 #endif
 #endif
 }
 }
 
 
@@ -1545,6 +1544,7 @@ static void init_once(void *foo)
 	INIT_LIST_HEAD(&nfsi->commit_info.list);
 	INIT_LIST_HEAD(&nfsi->commit_info.list);
 	nfsi->npages = 0;
 	nfsi->npages = 0;
 	nfsi->commit_info.ncommit = 0;
 	nfsi->commit_info.ncommit = 0;
+	atomic_set(&nfsi->commit_info.rpcs_out, 0);
 	atomic_set(&nfsi->silly_count, 1);
 	atomic_set(&nfsi->silly_count, 1);
 	INIT_HLIST_HEAD(&nfsi->silly_list);
 	INIT_HLIST_HEAD(&nfsi->silly_list);
 	init_waitqueue_head(&nfsi->waitqueue);
 	init_waitqueue_head(&nfsi->waitqueue);