gfs2: Fix gfs2_lookup_by_inum lock inversion

Browse source

The current gfs2_lookup_by_inum takes the glock of a presumed inode
identified by block number, verifies that the block is indeed an inode,
and then instantiates and reads the new inode via gfs2_inode_lookup.

However, instantiating a new inode may block on freeing a previous
instance of that inode (__wait_on_freeing_inode), and freeing an inode
requires to take the glock already held, leading to lock inversion and
deadlock.

Fix this by first instantiating the new inode, then verifying that the
block is an inode (if required), and then reading in the new inode, all
in gfs2_inode_lookup.

If the block we are looking for is not an inode, we discard the new
inode via iget_failed, which marks inodes as bad and unhashes them.
Other tasks waiting on that inode will get back a bad inode back from
ilookup or iget_locked; in that case, retry the lookup.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>

...

This commit is contained in:

Andreas Gruenbacher 2016-06-14 12:22:27 -05:00 • committed by Bob Peterson

parent 1e875f5a95

commit 3ce37b2cb4

5 changed files with 81 additions and 33 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

fs/gfs2/dir.c

View file

4

fs/gfs2/glock.c

View file

101

fs/gfs2/inode.c

View file

3

fs/gfs2/inode.h

View file

3

fs/gfs2/ops_fstype.c

View file