summaryrefslogtreecommitdiffstats
path: root/fs/cachefiles
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2020-10-26 10:12:10 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-26 18:42:54 +0100
commit9480b4e75b7108ee68ecf5bc6b4bd68e8031c521 (patch)
tree09602288708b3824dbc539c5f14d96315a7107a1 /fs/cachefiles
parentMerge tag 's390-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390... (diff)
downloadlinux-9480b4e75b7108ee68ecf5bc6b4bd68e8031c521.tar.xz
linux-9480b4e75b7108ee68ecf5bc6b4bd68e8031c521.zip
cachefiles: Handle readpage error correctly
If ->readpage returns an error, it has already unlocked the page. Fixes: 5e929b33c393 ("CacheFiles: Handle truncate unlocking the page we're reading") Cc: stable@vger.kernel.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/cachefiles')
-rw-r--r--fs/cachefiles/rdwr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
index 3080cda9e824..8bda092e60c5 100644
--- a/fs/cachefiles/rdwr.c
+++ b/fs/cachefiles/rdwr.c
@@ -121,7 +121,7 @@ static int cachefiles_read_reissue(struct cachefiles_object *object,
_debug("reissue read");
ret = bmapping->a_ops->readpage(NULL, backpage);
if (ret < 0)
- goto unlock_discard;
+ goto discard;
}
/* but the page may have been read before the monitor was installed, so
@@ -138,6 +138,7 @@ static int cachefiles_read_reissue(struct cachefiles_object *object,
unlock_discard:
unlock_page(backpage);
+discard:
spin_lock_irq(&object->work_lock);
list_del(&monitor->op_link);
spin_unlock_irq(&object->work_lock);