diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:31:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:31:42 -0700 |
| commit | b04cde34cf1d006dfaf8523640f3a18bbb15ebaa (patch) | |
| tree | a811f7a6db0de11f6c412548dfe081a57aba0451 /include | |
| parent | 4800be295c34268fd3211d49828bfaa6bf62867f (diff) | |
| parent | 603c83da19cf42d0f94022ac2fa389a431e32b84 (diff) | |
| download | op-kernel-dev-b04cde34cf1d006dfaf8523640f3a18bbb15ebaa.zip op-kernel-dev-b04cde34cf1d006dfaf8523640f3a18bbb15ebaa.tar.gz | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
NFSv4: Fix an rpc_cred reference leakage in fs/nfs/delegation.c
NFSv4: Ensure that we wait for the CLOSE request to complete
NFS: Fix a race in sillyrename
NFS: Fix a writeback race...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_fs.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index c5164c2..e82a6eb 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -160,6 +160,12 @@ struct nfs_inode { /* Open contexts for shared mmap writes */ struct list_head open_files; + /* Number of in-flight sillydelete RPC calls */ + atomic_t silly_count; + /* List of deferred sillydelete requests */ + struct hlist_head silly_list; + wait_queue_head_t waitqueue; + #ifdef CONFIG_NFS_V4 struct nfs4_cached_acl *nfs4_acl; /* NFSv4 state */ @@ -394,6 +400,8 @@ extern void nfs_release_automount_timer(void); */ extern int nfs_async_unlink(struct inode *dir, struct dentry *dentry); extern void nfs_complete_unlink(struct dentry *dentry, struct inode *); +extern void nfs_block_sillyrename(struct dentry *dentry); +extern void nfs_unblock_sillyrename(struct dentry *dentry); /* * linux/fs/nfs/write.c |
