Skip to content

Commit f57b4ae

Browse files
jankaragregkh
authored andcommitted
udf: Fix deadlock between writeback and udf_setsize()
commit f2e95355891153f66d4156bf3a142c6489cd78c6 upstream. udf_setsize() called truncate_setsize() with i_data_sem held. Thus truncate_pagecache() called from truncate_setsize() could lock a page under i_data_sem which can deadlock as page lock ranks below i_data_sem - e. g. writeback can hold page lock and try to acquire i_data_sem to map a block. Fix the problem by moving truncate_setsize() calls from under i_data_sem. It is safe for us to change i_size without holding i_data_sem as all the places that depend on i_size being stable already hold inode_lock. Fixes: 7e49b6f Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d2fa405 commit f57b4ae

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fs/udf/inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,8 +1235,8 @@ int udf_setsize(struct inode *inode, loff_t newsize)
12351235
return err;
12361236
}
12371237
set_size:
1238-
truncate_setsize(inode, newsize);
12391238
up_write(&iinfo->i_data_sem);
1239+
truncate_setsize(inode, newsize);
12401240
} else {
12411241
if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
12421242
down_write(&iinfo->i_data_sem);
@@ -1253,9 +1253,9 @@ int udf_setsize(struct inode *inode, loff_t newsize)
12531253
udf_get_block);
12541254
if (err)
12551255
return err;
1256+
truncate_setsize(inode, newsize);
12561257
down_write(&iinfo->i_data_sem);
12571258
udf_clear_extent_cache(inode);
1258-
truncate_setsize(inode, newsize);
12591259
udf_truncate_extents(inode);
12601260
up_write(&iinfo->i_data_sem);
12611261
}

0 commit comments

Comments
 (0)