Merge branch 'linux-2.6' into for-2.6.22

[sfrench/cifs-2.6.git] / fs / ocfs2 / vote.h

diff --git a/fs/ocfs2/vote.h b/fs/ocfs2/vote.h
index 9cce60703466561c4bd47db1148f94e646c64d52..9ea46f62de319b34707d9ed04ad6f253540236f3 100644 (file)
--- a/fs/ocfs2/vote.h
+++ b/fs/ocfs2/vote.h
@@ -38,19 +38,11 @@ static inline void ocfs2_kick_vote_thread(struct ocfs2_super *osb)
        wake_up(&osb->vote_event);
 }
 
-int ocfs2_request_delete_vote(struct inode *inode);
-int ocfs2_request_unlink_vote(struct inode *inode,
-                             struct dentry *dentry,
-                             unsigned int nlink);
-int ocfs2_request_rename_vote(struct inode *inode,
-                             struct dentry *dentry);
 int ocfs2_request_mount_vote(struct ocfs2_super *osb);
 int ocfs2_request_umount_vote(struct ocfs2_super *osb);
 int ocfs2_register_net_handlers(struct ocfs2_super *osb);
 void ocfs2_unregister_net_handlers(struct ocfs2_super *osb);
 
-void ocfs2_mark_inode_remotely_deleted(struct inode *inode);
-
 void ocfs2_remove_node_from_vote_queues(struct ocfs2_super *osb,
                                        int node_num);
 #endif