diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:24:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:24:57 -0700 |
| commit | 5b61f6accfd6449150aefe13a7679ec360abcc16 (patch) | |
| tree | 19544bac887b5849e6a3b4cbd2f78d7cd6774268 | |
| parent | 14016899967739585b7450d486681f4c5deec149 (diff) | |
| parent | 7ce9d5d1f3c8736511daa413c64985a05b2feee3 (diff) | |
| download | op-kernel-dev-5b61f6accfd6449150aefe13a7679ec360abcc16.zip op-kernel-dev-5b61f6accfd6449150aefe13a7679ec360abcc16.tar.gz | |
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
| -rw-r--r-- | fs/ext4/ialloc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index f18a919..627f8c3 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -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 { |
