diff options
author | Bob Peterson <rpeterso@redhat.com> | 2011-03-17 16:19:58 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2011-04-18 15:23:50 +0100 |
commit | 44ad37d69b2cc421d5b5c7ad7fed16230685b092 (patch) | |
tree | 3632c63eef9e159947316f18d48054f082c0578e /fs/gfs2/inode.h | |
parent | 001e8e8df4283dd4ef7a0297c012fce364c05cf1 (diff) | |
download | linux-44ad37d69b2cc421d5b5c7ad7fed16230685b092.tar.gz linux-44ad37d69b2cc421d5b5c7ad7fed16230685b092.tar.bz2 linux-44ad37d69b2cc421d5b5c7ad7fed16230685b092.zip |
GFS2: filesystem hang caused by incorrect lock order
This patch fixes a deadlock in GFS2 where two processes are trying
to reclaim an unlinked dinode:
One holds the inode glock and calls gfs2_lookup_by_inum trying to look
up the inode, which it can't, due to I_FREEING. The other has set
I_FREEING from vfs and is at the beginning of gfs2_delete_inode
waiting for the glock, which is held by the first. The solution is to
add a new non_block parameter to the gfs2_iget function that causes it
to return -ENOENT if the inode is being freed.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/inode.h')
-rw-r--r-- | fs/gfs2/inode.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index 3e00a66e7cbd..099ca305e518 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h @@ -97,7 +97,8 @@ err: } extern struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned type, - u64 no_addr, u64 no_formal_ino); + u64 no_addr, u64 no_formal_ino, + int non_block); extern struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr, u64 *no_formal_ino, unsigned int blktype); |