diff options
| author | Linus Torvalds | 2007-08-09 08:38:14 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2007-08-09 08:38:14 -0700 |
| commit | 8b80fc02b829a59602b0f53eb9393ffb2db2659d (patch) | |
| tree | 9cce02e07ed1b30d6f6bd236a2d6015e5681eeb9 /include | |
| parent | 6a0ed91e361a93ee1efb4c20c4967024ed2a8dd7 (diff) | |
| parent | 4011cd97886dd04b90fef8b671b9936cd39ab983 (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends
NFS: Replace flush_scheduled_work with cancel_work_sync() and friends
SUNRPC: Don't call gss_delete_sec_context() from an rcu context
NFSv4: Don't call put_rpccred() from an rcu callback
NFS: Fix NFSv4 open stateid regressions
NFSv4: Fix a locking regression in nfs4_set_mode_locked()
NFS: Fix put_nfs_open_context
SUNRPC: Fix a race in rpciod_down()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 9ba4aec37c50..157dcb055b5c 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -71,7 +71,7 @@ struct nfs_access_entry { struct nfs4_state; struct nfs_open_context { - struct kref kref; + atomic_t count; struct path path; struct rpc_cred *cred; struct nfs4_state *state; |