diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 14:33:31 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 14:33:31 +0100 |
commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch) | |
tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 /fs/ocfs2/dcache.h | |
parent | ae7462b4f1fe1f36b5d562dbd5202a2eba01f072 (diff) | |
parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
download | op-kernel-dev-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.zip op-kernel-dev-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.tar.gz |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'fs/ocfs2/dcache.h')
-rw-r--r-- | fs/ocfs2/dcache.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ocfs2/dcache.h b/fs/ocfs2/dcache.h index c091c34..d06e16c 100644 --- a/fs/ocfs2/dcache.h +++ b/fs/ocfs2/dcache.h @@ -29,8 +29,13 @@ extern 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 @@ -47,6 +52,8 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry, struct inode *inode, void ocfs2_dentry_lock_put(struct ocfs2_super *osb, struct ocfs2_dentry_lock *dl); +void ocfs2_drop_dl_inodes(struct work_struct *work); + struct dentry *ocfs2_find_local_alias(struct inode *inode, u64 parent_blkno, int skip_unhashed); |