Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5f3953c authored by Chris Mason's avatar Chris Mason Committed by Linus Torvalds
Browse files

[PATCH] fix reiserfs lock inversion of bkl vs inode semaphore 



The correct lock ordering is inode lock -> BKL

Signed-off-by: default avatarChris Mason <mason@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ebd15302

fs/reiserfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp) 
		return 0;

	}



	reiserfs_write_lock(inode->i_sb);

	mutex_lock(&inode->i_mutex);

	reiserfs_write_lock(inode->i_sb);

	/* freeing preallocation only involves relogging blocks that

	 * are already in the current transaction.  preallocation gets

	 * freed at the end of each transaction, so it is impossible for

fs/reiserfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -116,12 +116,12 @@ static int reiserfs_unpack(struct inode *inode, struct file *filp) 
	if (REISERFS_I(inode)->i_flags & i_nopack_mask) {

		return 0;

	}

	reiserfs_write_lock(inode->i_sb);



	/* we need to make sure nobody is changing the file size beneath

	 ** us

	 */

	mutex_lock(&inode->i_mutex);

	reiserfs_write_lock(inode->i_sb);



	write_from = inode->i_size & (blocksize - 1);

	/* if we are on a block boundary, we are already unpacked.  */