reiserfs: Fix inode mutex - reiserfs lock misordering
PATCH 1/1 reiserfs: Fix inode mutex - reiserfs lock misordering
reiserfs_unpack() locks the inode mutex with reiserfs_mutex_lock_safe() to protect against reiserfs lock dependency. However this protection requires to have the reiserfs lock to be locked.
This is the case if reiserfs_unpack() is called by reiserfs_ioctl but not from reiserfs_quota_on() when it tries to unpack tails of quota files.
Fix the ordering of the two locks in reiserfs_unpack() to fix this issue.
--- fs/reiserfs/ioctl.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
fs/reiserfs/ioctl.c +3 -4
@@ -184,12 +184,11 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)return 0 ; } -/* we need to make sure nobody is changing the file size beneath -** us -*/ -reiserfs_mutex_lock_safe (&inode->i_mutex, inode->i_sb); depth =reiserfs_write_lock_once (inode->i_sb); +/* we need to make sure nobody is changing the file size beneath us */ +reiserfs_mutex_lock_safe (&inode->i_mutex, inode->i_sb); + write_from = inode->i_size & (blocksize -1 );/* if we are on a block boundary, we are already unpacked. */ if (write_from ==0 ) {
Signature · 1 line
1.6.2.3
PATCH v2 1/1 reiserfs: Fix inode mutex - reiserfs lock misordering
reiserfs_unpack() locks the inode mutex with reiserfs_mutex_lock_safe() to protect against reiserfs lock dependency. However this protection requires to have the reiserfs lock to be locked.
This is the case if reiserfs_unpack() is called by reiserfs_ioctl but not from reiserfs_quota_on() when it tries to unpack tails of quota files.
Fix the ordering of the two locks in reiserfs_unpack() to fix this issue.
--- fs/reiserfs/ioctl.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
fs/reiserfs/ioctl.c +3 -4
@@ -184,12 +184,11 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)return 0 ; } -/* we need to make sure nobody is changing the file size beneath -** us -*/ -reiserfs_mutex_lock_safe (&inode->i_mutex, inode->i_sb); depth =reiserfs_write_lock_once (inode->i_sb); +/* we need to make sure nobody is changing the file size beneath us */ +reiserfs_mutex_lock_safe (&inode->i_mutex, inode->i_sb); + write_from = inode->i_size & (blocksize -1 );/* if we are on a block boundary, we are already unpacked. */ if (write_from ==0 ) {
Signature · 1 line
1.6.2.3