[GFS2] Fix up merge of Linus' kernel into GFS2

[pandora-kernel.git] / fs / ocfs2 / dcache.h

diff --git a/fs/ocfs2/dcache.h b/fs/ocfs2/dcache.h
index 9007277..c091c34 100644 (file)
--- a/fs/ocfs2/dcache.h
+++ b/fs/ocfs2/dcache.h
@@ -28,4 +28,31 @@
 
 extern struct dentry_operations ocfs2_dentry_ops;
 
+struct ocfs2_dentry_lock {
+       unsigned int            dl_count;
+       u64                     dl_parent_blkno;
+
+       /*
+        * The ocfs2_dentry_lock keeps an inode reference until
+        * dl_lockres has been destroyed. This is usually done in
+        * ->d_iput() anyway, so there should be minimal impact.
+        */
+       struct inode            *dl_inode;
+       struct ocfs2_lock_res   dl_lockres;
+};
+
+int ocfs2_dentry_attach_lock(struct dentry *dentry, struct inode *inode,
+                            u64 parent_blkno);
+
+void ocfs2_dentry_lock_put(struct ocfs2_super *osb,
+                          struct ocfs2_dentry_lock *dl);
+
+struct dentry *ocfs2_find_local_alias(struct inode *inode, u64 parent_blkno,
+                                     int skip_unhashed);
+
+void ocfs2_dentry_move(struct dentry *dentry, struct dentry *target,
+                      struct inode *old_dir, struct inode *new_dir);
+
+extern spinlock_t dentry_attach_lock;
+
 #endif /* OCFS2_DCACHE_H */