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

Commit 2788511b authored by David Howells's avatar David Howells Committed by Greg Kroah-Hartman
Browse files

afs: afs_write_end() should change i_size under the right lock 



[ Upstream commit 1f32ef79897052ef7d3d154610d8d6af95abde83 ]

Fix afs_write_end() to change i_size under vnode->cb_lock rather than
->wb_lock so that it doesn't race with afs_vnode_commit_status() and
afs_getattr().

The ->wb_lock is only meant to guard access to ->wb_keys which isn't
accessed by that piece of code.

Fixes: 4343d008 ("afs: Get rid of the afs_writeback record")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 08de5907

fs/afs/write.c

+2 −2
Original line number Diff line number Diff line
@@ -188,11 +188,11 @@ int afs_write_end(struct file *file, struct address_space *mapping, 


	i_size = i_size_read(&vnode->vfs_inode);

	if (maybe_i_size > i_size) {

		spin_lock(&vnode->wb_lock);

		write_seqlock(&vnode->cb_lock);

		i_size = i_size_read(&vnode->vfs_inode);

		if (maybe_i_size > i_size)

			i_size_write(&vnode->vfs_inode, maybe_i_size);

		spin_unlock(&vnode->wb_lock);

		write_sequnlock(&vnode->cb_lock);

	}



	if (!PageUptodate(page)) {