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

Commit c7d206b3 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

vfs: Move mark_inode_dirty() from under page lock in generic_write_end() 



There's no need to call mark_inode_dirty() under page lock in
generic_write_end(). It unnecessarily makes hold time of page lock longer
and more importantly it forces locking order of page lock and transaction
start for journaling filesystems.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 2e9ee850

fs/buffer.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -2061,6 +2061,7 @@ int generic_write_end(struct file *file, struct address_space *mapping, 
			struct page *page, void *fsdata)

			struct page *page, void *fsdata)

{

{

	struct inode *inode = mapping->host;

	struct inode *inode = mapping->host;

	int i_size_changed = 0;





	copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);

	copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);
@@ -2073,12 +2074,21 @@ int generic_write_end(struct file *file, struct address_space *mapping, 
	 */

	 */

	if (pos+copied > inode->i_size) {

	if (pos+copied > inode->i_size) {

		i_size_write(inode, pos+copied);

		i_size_write(inode, pos+copied);

		mark_inode_dirty(inode);

		i_size_changed = 1;

	}

	}





	unlock_page(page);

	unlock_page(page);

	page_cache_release(page);

	page_cache_release(page);





	/*

	 * Don't mark the inode dirty under page lock. First, it unnecessarily

	 * makes the holding time of page lock longer. Second, it forces lock

	 * ordering of page lock and transaction start for journaling

	 * filesystems.

	 */

	if (i_size_changed)

		mark_inode_dirty(inode);



	return copied;

	return copied;

}

}

EXPORT_SYMBOL(generic_write_end);

EXPORT_SYMBOL(generic_write_end);