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

Commit 202f2bb0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: Issue the discard operation *before* releasing the blocks to be reused
  ext4: Fix buffer head leaks after calls to ext4_get_inode_loc()
  ext4: Fix possible lost inode write in no journal mode
parents ddc9b34c b90f6870

fs/ext4/extents.c

+1 −0
Original line number Diff line number Diff line
@@ -3879,6 +3879,7 @@ static int ext4_xattr_fiemap(struct inode *inode, 
		physical += offset;

		length = EXT4_SB(inode->i_sb)->s_inode_size - offset;

		flags |= FIEMAP_EXTENT_DATA_INLINE;

		brelse(iloc.bh);

	} else { /* external block */

		physical = EXT4_I(inode)->i_file_acl << blockbits;

		length = inode->i_sb->s_blocksize;

fs/ext4/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -5375,7 +5375,7 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) 
	} else {

		struct ext4_iloc iloc;



		err = ext4_get_inode_loc(inode, &iloc);

		err = __ext4_get_inode_loc(inode, &iloc, 0);

		if (err)

			return err;

		if (wbc->sync_mode == WB_SYNC_ALL)
@@ -5386,6 +5386,7 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) 
				   (unsigned long long)iloc.bh->b_blocknr);

			err = -EIO;

		}

		brelse(iloc.bh);

	}

	return err;

}

fs/ext4/mballoc.c

+11 −10
Original line number Diff line number Diff line
@@ -2535,6 +2535,17 @@ static void release_blocks_on_commit(journal_t *journal, transaction_t *txn) 
		mb_debug(1, "gonna free %u blocks in group %u (0x%p):",

			 entry->count, entry->group, entry);



		if (test_opt(sb, DISCARD)) {

			ext4_fsblk_t discard_block;



			discard_block = entry->start_blk +

				ext4_group_first_block_no(sb, entry->group);

			trace_ext4_discard_blocks(sb,

					(unsigned long long)discard_block,

					entry->count);

			sb_issue_discard(sb, discard_block, entry->count);

		}



		err = ext4_mb_load_buddy(sb, entry->group, &e4b);

		/* we expect to find existing buddy because it's pinned */

		BUG_ON(err != 0);
@@ -2556,16 +2567,6 @@ static void release_blocks_on_commit(journal_t *journal, transaction_t *txn) 
			page_cache_release(e4b.bd_bitmap_page);

		}

		ext4_unlock_group(sb, entry->group);

		if (test_opt(sb, DISCARD)) {

			ext4_fsblk_t discard_block;



			discard_block = entry->start_blk +

				ext4_group_first_block_no(sb, entry->group);

			trace_ext4_discard_blocks(sb,

					(unsigned long long)discard_block,

					entry->count);

			sb_issue_discard(sb, discard_block, entry->count);

		}

		kmem_cache_free(ext4_free_ext_cachep, entry);

		ext4_mb_release_desc(&e4b);

	}