Commit 9480b4e7 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds

cachefiles: Handle readpage error correctly

If ->readpage returns an error, it has already unlocked the page.

Fixes: 5e929b33 ("CacheFiles: Handle truncate unlocking the page we're reading")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e2b2da6
...@@ -121,7 +121,7 @@ static int cachefiles_read_reissue(struct cachefiles_object *object, ...@@ -121,7 +121,7 @@ static int cachefiles_read_reissue(struct cachefiles_object *object,
_debug("reissue read"); _debug("reissue read");
ret = bmapping->a_ops->readpage(NULL, backpage); ret = bmapping->a_ops->readpage(NULL, backpage);
if (ret < 0) if (ret < 0)
goto unlock_discard; goto discard;
} }
/* but the page may have been read before the monitor was installed, so /* 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, ...@@ -138,6 +138,7 @@ static int cachefiles_read_reissue(struct cachefiles_object *object,
unlock_discard: unlock_discard:
unlock_page(backpage); unlock_page(backpage);
discard:
spin_lock_irq(&object->work_lock); spin_lock_irq(&object->work_lock);
list_del(&monitor->op_link); list_del(&monitor->op_link);
spin_unlock_irq(&object->work_lock); spin_unlock_irq(&object->work_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment