diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2020-10-26 09:12:10 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-05 11:51:54 +0100 |
| commit | 6657fd8e618e3d31c4338fe5ed807c9ac16b8395 (patch) | |
| tree | 5ea8ff1b08325a2c69bd0c24aad56d2e9385da08 | |
| parent | 95be27d273f4896347d8d76e5bcefcde2e75025d (diff) | |
| download | linux-stable-6657fd8e618e3d31c4338fe5ed807c9ac16b8395.tar.gz linux-stable-6657fd8e618e3d31c4338fe5ed807c9ac16b8395.tar.bz2 linux-stable-6657fd8e618e3d31c4338fe5ed807c9ac16b8395.zip | |
cachefiles: Handle readpage error correctly
commit 9480b4e75b7108ee68ecf5bc6b4bd68e8031c521 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/cachefiles/rdwr.c | 3 |
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); |