diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-20 00:38:56 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-20 00:42:28 +0200 |
| commit | 1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22 (patch) | |
| tree | 25a4e70970633700ef856f5cd49e753aa0e26160 | |
| parent | NFS: Fix a refcounting issue in O_DIRECT (diff) | |
| download | linux-1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22.tar.xz linux-1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22.zip | |
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>
| -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) 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); |