diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-19 18:38:56 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-19 18:42:28 -0400 |
commit | 1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22 (patch) | |
tree | 25a4e70970633700ef856f5cd49e753aa0e26160 /fs/nfs | |
parent | 5a695da26367f53a368c90435e0b883c12f02791 (diff) |
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>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index e605d695dbcb..f7296983eba6 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) | |||
1530 | nfsi->delegation_state = 0; | 1530 | nfsi->delegation_state = 0; |
1531 | init_rwsem(&nfsi->rwsem); | 1531 | init_rwsem(&nfsi->rwsem); |
1532 | nfsi->layout = NULL; | 1532 | nfsi->layout = NULL; |
1533 | atomic_set(&nfsi->commit_info.rpcs_out, 0); | ||
1534 | #endif | 1533 | #endif |
1535 | } | 1534 | } |
1536 | 1535 | ||
@@ -1545,6 +1544,7 @@ static void init_once(void *foo) | |||
1545 | INIT_LIST_HEAD(&nfsi->commit_info.list); | 1544 | INIT_LIST_HEAD(&nfsi->commit_info.list); |
1546 | nfsi->npages = 0; | 1545 | nfsi->npages = 0; |
1547 | nfsi->commit_info.ncommit = 0; | 1546 | nfsi->commit_info.ncommit = 0; |
1547 | atomic_set(&nfsi->commit_info.rpcs_out, 0); | ||
1548 | atomic_set(&nfsi->silly_count, 1); | 1548 | atomic_set(&nfsi->silly_count, 1); |
1549 | INIT_HLIST_HEAD(&nfsi->silly_list); | 1549 | INIT_HLIST_HEAD(&nfsi->silly_list); |
1550 | init_waitqueue_head(&nfsi->waitqueue); | 1550 | init_waitqueue_head(&nfsi->waitqueue); |