]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
udf: Fix deadlock when converting file from in-ICB one to normal one
authorJan Kara <jack@suse.cz>
Sat, 10 Dec 2011 01:30:48 +0000 (02:30 +0100)
committerJan Kara <jack@suse.cz>
Mon, 9 Jan 2012 12:52:08 +0000 (13:52 +0100)
commitd2eb8c359309ec45d6bf5b147303ab8e13be86ea
tree4725da2f9f5728b41960cff7b628d0997812504c
parent7b0b0933a3ff6052addf4d49ea99f75ab27df2d0
udf: Fix deadlock when converting file from in-ICB one to normal one

During BKL removal in 2.6.38, conversion of files from in-ICB format to normal
format got broken. We call ->writepage with i_data_sem held but udf_get_block()
also acquires i_data_sem thus creating A-A deadlock.

We fix the problem by dropping i_data_sem before calling ->writepage() which is
safe since i_mutex still protects us against any changes in the file. Also fix
pagelock - i_data_sem lock inversion in udf_expand_file_adinicb() by dropping
i_data_sem before calling find_or_create_page().

CC: stable@kernel.org
Reported-by: Matthias Matiak <netzpython@mail-on.us>
Tested-by: Matthias Matiak <netzpython@mail-on.us>
Reviewed-by: Namjae Jeon <linkinjeon@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/udf/file.c
fs/udf/inode.c