diff options
| author | Jan Kara <jack@suse.cz> | 2009-07-20 12:12:36 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-07-21 15:47:55 -0700 |
| commit | f7b1aa69be138ad9d7d3f31fa56f4c9407f56b6a (patch) | |
| tree | 3d3ca30071d9d92ff3ad5c6d522ea6c05efb3885 /fs/ocfs2/dcache.h | |
| parent | 3c5e10683e684ef45614c9071847e48f633d9806 (diff) | |
| download | lwn-f7b1aa69be138ad9d7d3f31fa56f4c9407f56b6a.tar.gz lwn-f7b1aa69be138ad9d7d3f31fa56f4c9407f56b6a.zip | |
ocfs2: Fix deadlock on umount
In commit ea455f8ab68338ba69f5d3362b342c115bea8e13, we moved the dentry lock
put process into ocfs2_wq. This causes problems during umount because ocfs2_wq
can drop references to inodes while they are being invalidated by
invalidate_inodes() causing all sorts of nasty things (invalidate_inodes()
ending in an infinite loop, "Busy inodes after umount" messages etc.).
We fix the problem by stopping ocfs2_wq from doing any further releasing of
inode references on the superblock being unmounted, wait until it finishes
the current round of releasing and finally cleaning up all the references in
dentry_lock_list from ocfs2_put_super().
The issue was tracked down by Tao Ma <tao.ma@oracle.com>.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/dcache.h')
| -rw-r--r-- | fs/ocfs2/dcache.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/dcache.h b/fs/ocfs2/dcache.h index faa12e75f98d..f5dd1789acf1 100644 --- a/fs/ocfs2/dcache.h +++ b/fs/ocfs2/dcache.h @@ -49,10 +49,13 @@ struct ocfs2_dentry_lock { 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); |