Merge branch 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / include / linux / nfs_fs.h

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index cede8f6a7e2dd3477d7986c79292d3144d529f5f..d71278c3c5bdda030e3edbc03946a1b4282cd8ad 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -163,11 +163,9 @@ 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;
+       /* Readers: in-flight sillydelete RPC calls */
+       /* Writers: rmdir */
+       struct rw_semaphore     rmdir_sem;
 
 #if IS_ENABLED(CONFIG_NFS_V4)
        struct nfs4_cached_acl  *nfs4_acl;
@@ -491,9 +489,6 @@ extern void nfs_release_automount_timer(void);
  * linux/fs/nfs/unlink.c
  */
 extern void nfs_complete_unlink(struct dentry *dentry, struct inode *);
-extern void nfs_wait_on_sillyrename(struct dentry *dentry);
-extern void nfs_block_sillyrename(struct dentry *dentry);
-extern void nfs_unblock_sillyrename(struct dentry *dentry);
 
 /*
  * linux/fs/nfs/write.c