Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix ext4_free_inode() vs. ext4_claim_inode() race
This commit is contained in:
commit
5b61f6accf
|
@ -188,7 +188,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
|
|||
struct ext4_group_desc *gdp;
|
||||
struct ext4_super_block *es;
|
||||
struct ext4_sb_info *sbi;
|
||||
int fatal = 0, err, count;
|
||||
int fatal = 0, err, count, cleared;
|
||||
ext4_group_t flex_group;
|
||||
|
||||
if (atomic_read(&inode->i_count) > 1) {
|
||||
|
@ -248,8 +248,10 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
|
|||
goto error_return;
|
||||
|
||||
/* Ok, now we can actually update the inode bitmaps.. */
|
||||
if (!ext4_clear_bit_atomic(sb_bgl_lock(sbi, block_group),
|
||||
bit, bitmap_bh->b_data))
|
||||
spin_lock(sb_bgl_lock(sbi, block_group));
|
||||
cleared = ext4_clear_bit(bit, bitmap_bh->b_data);
|
||||
spin_unlock(sb_bgl_lock(sbi, block_group));
|
||||
if (!cleared)
|
||||
ext4_error(sb, "ext4_free_inode",
|
||||
"bit already cleared for inode %lu", ino);
|
||||
else {
|
||||
|
|
Loading…
Reference in a new issue