diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-24 17:03:14 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-24 17:03:14 -0400 |
| commit | 0acd2201920d0968919f4f5797d63f7b6f2b19d4 (patch) | |
| tree | 9b241d264f42eff3ff4eeffb67616fca0490e460 /fs/nfs/inode.c | |
| parent | 8f70e95f9f4159184f557a1db60c909d7c1bd2e3 (diff) | |
| parent | 35124a0994fc02545b14b9fa3aad000b3331f1c0 (diff) | |
| download | talos-op-linux-0acd2201920d0968919f4f5797d63f7b6f2b19d4.tar.gz talos-op-linux-0acd2201920d0968919f4f5797d63f7b6f2b19d4.zip | |
Merge branch 'nfs-for-2.6.39' into nfs-for-next
Diffstat (limited to 'fs/nfs/inode.c')
| -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 058d7d63e566..57bb31ad7a5e 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -641,7 +641,6 @@ struct nfs_open_context *alloc_nfs_open_context(struct path *path, struct rpc_cr ctx->mode = f_mode; ctx->flags = 0; ctx->error = 0; - ctx->dir_cookie = 0; nfs_init_lock_context(&ctx->lock_context); ctx->lock_context.open_context = ctx; INIT_LIST_HEAD(&ctx->list); @@ -1473,6 +1472,7 @@ static inline void nfs4_init_once(struct nfs_inode *nfsi) nfsi->delegation_state = 0; init_rwsem(&nfsi->rwsem); nfsi->layout = NULL; + atomic_set(&nfsi->commits_outstanding, 0); #endif } |
