diff options
author | Tiger Yang <tiger.yang@oracle.com> | 2007-03-20 19:01:38 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2007-04-26 17:39:48 -0400 |
commit | 500086300e6dc5308a7328990bd50d17e075162b (patch) | |
tree | 4083cda09445c260c2cc2ac1d0f68c05ad2b958e /fs/ocfs2/inode.h | |
parent | a9f5f70739363ccca2e771c274c4f015c5fb7a88 (diff) |
ocfs2: Remove delete inode vote
Ocfs2 currently does cluster-wide node messaging to check the open state of
an inode during delete. This patch removes that mechanism in favor of an
inode cluster lock which is taken at shared read when an inode is first read
and dropped in clear_inode(). This allows a deleting node to test the
liveness of an inode by attempting to take an exclusive lock.
Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/inode.h')
-rw-r--r-- | fs/ocfs2/inode.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h index 1a7dd2945b34..92d4feb34d74 100644 --- a/fs/ocfs2/inode.h +++ b/fs/ocfs2/inode.h | |||
@@ -34,6 +34,7 @@ struct ocfs2_inode_info | |||
34 | struct ocfs2_lock_res ip_rw_lockres; | 34 | struct ocfs2_lock_res ip_rw_lockres; |
35 | struct ocfs2_lock_res ip_meta_lockres; | 35 | struct ocfs2_lock_res ip_meta_lockres; |
36 | struct ocfs2_lock_res ip_data_lockres; | 36 | struct ocfs2_lock_res ip_data_lockres; |
37 | struct ocfs2_lock_res ip_open_lockres; | ||
37 | 38 | ||
38 | /* protects allocation changes on this inode. */ | 39 | /* protects allocation changes on this inode. */ |
39 | struct rw_semaphore ip_alloc_sem; | 40 | struct rw_semaphore ip_alloc_sem; |
@@ -119,8 +120,8 @@ void ocfs2_drop_inode(struct inode *inode); | |||
119 | /* Flags for ocfs2_iget() */ | 120 | /* Flags for ocfs2_iget() */ |
120 | #define OCFS2_FI_FLAG_NOWAIT 0x1 | 121 | #define OCFS2_FI_FLAG_NOWAIT 0x1 |
121 | #define OCFS2_FI_FLAG_DELETE 0x2 | 122 | #define OCFS2_FI_FLAG_DELETE 0x2 |
122 | #define OCFS2_FI_FLAG_SYSFILE 0x4 | 123 | #define OCFS2_FI_FLAG_SYSFILE 0x4 |
123 | #define OCFS2_FI_FLAG_NOLOCK 0x8 | 124 | #define OCFS2_FI_FLAG_ORPHAN_RECOVERY 0x8 |
124 | struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 feoff, int flags); | 125 | struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 feoff, int flags); |
125 | struct inode *ocfs2_ilookup_for_vote(struct ocfs2_super *osb, | 126 | struct inode *ocfs2_ilookup_for_vote(struct ocfs2_super *osb, |
126 | u64 blkno, | 127 | u64 blkno, |