nfsd4.1: fix session memory use calculation

[safe/jmp/linux-2.6] / fs / ocfs2 / dcache.h

diff --git a/fs/ocfs2/dcache.h b/fs/ocfs2/dcache.h
index f1423c2..f5dd178 100644 (file)
--- a/fs/ocfs2/dcache.h
+++ b/fs/ocfs2/dcache.h
@@ -26,11 +26,16 @@
 #ifndef OCFS2_DCACHE_H
 #define OCFS2_DCACHE_H
 
-extern struct dentry_operations ocfs2_dentry_ops;
+extern const struct dentry_operations ocfs2_dentry_ops;
 
 struct ocfs2_dentry_lock {
+       /* Use count of dentry lock */
        unsigned int            dl_count;
-       u64                     dl_parent_blkno;
+       union {
+               /* Linked list of dentry locks to release */
+               struct ocfs2_dentry_lock *dl_next;
+               u64                     dl_parent_blkno;
+       };
 
        /*
         * The ocfs2_dentry_lock keeps an inode reference until
@@ -41,17 +46,22 @@ struct ocfs2_dentry_lock {
        struct ocfs2_lock_res   dl_lockres;
 };
 
-static inline void ocfs2_dentry_lock_put(struct ocfs2_super *osb,
-                                        struct ocfs2_dentry_lock *dl)
-{
-}
-
-static inline struct dentry *ocfs2_find_local_alias(struct inode *inode,
-                                                   u64 parent_blkno,
-                                                   int skip_unhashed)
-{
-       return NULL;
-}
+int ocfs2_dentry_attach_lock(struct dentry *dentry, struct inode *inode,
+                            u64 parent_blkno);
+
+extern spinlock_t dentry_list_lock;
+
+void ocfs2_dentry_lock_put(struct ocfs2_super *osb,
+                          struct ocfs2_dentry_lock *dl);
+
+void ocfs2_drop_dl_inodes(struct work_struct *work);
+void ocfs2_drop_all_dl_inodes(struct ocfs2_super *osb);
+
+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;