Skip to content

Commit

Permalink
ext2: Silence lockdep warning about reclaim under xattr_sem
Browse files Browse the repository at this point in the history
Lockdep complains about a chain:
  sb_internal#2 --> &ei->xattr_sem#2 --> fs_reclaim

and shrink_dentry_list -> ext2_evict_inode -> ext2_xattr_delete_inode ->
down_write(ei->xattr_sem) creating a locking cycle in the reclaim path.
This is however a false positive because when we are in
ext2_evict_inode() we are the only holder of the inode reference and
nobody else should touch xattr_sem of that inode. So we cannot ever
block on acquiring the xattr_sem in the reclaim path.

Silence the lockdep warning by using down_write_trylock() in
ext2_xattr_delete_inode() to not create false locking dependency.

Reported-by: "J. R. Okajima" <[email protected]>
Reviewed-by: Ritesh Harjani <[email protected]>
Signed-off-by: Jan Kara <[email protected]>
  • Loading branch information
jankara committed Feb 26, 2020
1 parent f8788d8 commit bc36dff
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion fs/ext2/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,15 @@ ext2_xattr_delete_inode(struct inode *inode)
struct buffer_head *bh = NULL;
struct ext2_sb_info *sbi = EXT2_SB(inode->i_sb);

down_write(&EXT2_I(inode)->xattr_sem);
/*
* We are the only ones holding inode reference. The xattr_sem should
* better be unlocked! We could as well just not acquire xattr_sem at
* all but this makes the code more futureproof. OTOH we need trylock
* here to avoid false-positive warning from lockdep about reclaim
* circular dependency.
*/
if (WARN_ON_ONCE(!down_write_trylock(&EXT2_I(inode)->xattr_sem)))
return;
if (!EXT2_I(inode)->i_file_acl)
goto cleanup;

Expand Down

0 comments on commit bc36dff

Please sign in to comment.