mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
cachefiles: Handle readpage error correctly
commit9480b4e75b
upstream. If ->readpage returns an error, it has already unlocked the page. Fixes:5e929b33c3
("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
69c65357db
commit
693d923af5
1 changed files with 2 additions and 1 deletions
|
@ -125,7 +125,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
|
||||
|
@ -142,6 +142,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);
|
||||
|
|
Loading…
Reference in a new issue