diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2011-03-17 23:19:58 +0300 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2011-04-18 18:23:50 +0400 |
| commit | 44ad37d69b2cc421d5b5c7ad7fed16230685b092 (patch) | |
| tree | 3632c63eef9e159947316f18d48054f082c0578e /fs/gfs2/dir.c | |
| parent | 001e8e8df4283dd4ef7a0297c012fce364c05cf1 (diff) | |
| download | linux-44ad37d69b2cc421d5b5c7ad7fed16230685b092.tar.xz | |
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/dir.c')
| -rw-r--r-- | fs/gfs2/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 5c356d09c321..f789c5732b7c 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -1506,7 +1506,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name) inode = gfs2_inode_lookup(dir->i_sb, be16_to_cpu(dent->de_type), be64_to_cpu(dent->de_inum.no_addr), - be64_to_cpu(dent->de_inum.no_formal_ino)); + be64_to_cpu(dent->de_inum.no_formal_ino), 0); brelse(bh); return inode; } |