summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2020-06-12 23:58:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-25 15:33:06 +0200
commit2788511b09b7c1208836d5f6752e6ae0acc5b7b6 (patch)
tree58e54a7e76dcae4b841421526536fd0a59927625
parent08de5907c06ed7397930781244e066364708658d (diff)
downloadlinux-stable-2788511b09b7c1208836d5f6752e6ae0acc5b7b6.tar.gz
linux-stable-2788511b09b7c1208836d5f6752e6ae0acc5b7b6.tar.bz2
linux-stable-2788511b09b7c1208836d5f6752e6ae0acc5b7b6.zip
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: 4343d00872e1 ("afs: Get rid of the afs_writeback record") Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/afs/write.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c
index 53f329f61cc3..ec8d27cf92a5 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -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)) {