diff options
| author | Alexey Khoroshilov | 2014-09-02 09:40:17 +0200 |
|---|---|---|
| committer | Al Viro | 2014-09-07 19:26:39 +0200 |
| commit | 9ef7db7f38d0472dd9c444e42d5c5175ccbe5451 (patch) | |
| tree | 38098751b8e07a868788fda862f96763b55d0763 /fs/ufs/inode.c | |
| parent | fix EBUSY on umount() from MNT_SHRINKABLE (diff) | |
| download | kernel-qcow2-linux-9ef7db7f38d0472dd9c444e42d5c5175ccbe5451.tar.gz kernel-qcow2-linux-9ef7db7f38d0472dd9c444e42d5c5175ccbe5451.tar.xz kernel-qcow2-linux-9ef7db7f38d0472dd9c444e42d5c5175ccbe5451.zip | |
ufs: fix deadlocks introduced by sb mutex merge
Commit 0244756edc4b ("ufs: sb mutex merge + mutex_destroy") introduces
deadlocks in ufs_new_inode() and ufs_free_inode().
Most callers of that functions acqure the mutex by themselves and
ufs_{new,free}_inode() do that via lock_ufs(),
i.e we have an unavoidable double lock.
The patch proposes to resolve the issue by making sure that
ufs_{new,free}_inode() are not called with the mutex held.
Found by Linux Driver Verification project (linuxtesting.org).
Cc: stable@vger.kernel.org # 3.16
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ufs/inode.c')
| -rw-r--r-- | fs/ufs/inode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 7c580c97990e..be7d42c7d938 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -902,9 +902,6 @@ void ufs_evict_inode(struct inode * inode) invalidate_inode_buffers(inode); clear_inode(inode); - if (want_delete) { - lock_ufs(inode->i_sb); - ufs_free_inode (inode); - unlock_ufs(inode->i_sb); - } + if (want_delete) + ufs_free_inode(inode); } |