diff options
| author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-02-22 17:35:08 -0800 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-03-01 11:32:41 -0800 |
| commit | b4df6ed8db0c387d38292e31f00adc4cd297ed5a (patch) | |
| tree | d7dcaeecfa55b3fd9d6c4844d90e07759182f845 /fs/ocfs2/ocfs2.h | |
| parent | 895928b8380cc697ac56e9732cedf549c0a4f79c (diff) | |
| download | linux-stable-b4df6ed8db0c387d38292e31f00adc4cd297ed5a.tar.gz linux-stable-b4df6ed8db0c387d38292e31f00adc4cd297ed5a.tar.bz2 linux-stable-b4df6ed8db0c387d38292e31f00adc4cd297ed5a.zip | |
[PATCH] ocfs2: fix orphan recovery deadlock
Orphan dir recovery can deadlock with another process in
ocfs2_delete_inode() in some corner cases. Fix this by tracking recovery
state more closely and allowing it to handle inode wipes which might
deadlock.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
| -rw-r--r-- | fs/ocfs2/ocfs2.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index 19360e3d842e..e89de9b6e491 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h @@ -287,6 +287,10 @@ struct ocfs2_super struct inode *osb_tl_inode; struct buffer_head *osb_tl_bh; struct work_struct osb_truncate_log_wq; + + struct ocfs2_node_map osb_recovering_orphan_dirs; + unsigned int *osb_orphan_wipes; + wait_queue_head_t osb_wipe_event; }; #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) |