cachefiles: Handle readpage error correctly

commit 9480b4e upstream. If ->readpage returns an error, it has already unlocked the page. Fixes: 5e929b3 ("CacheFiles: Handle truncate unlocking the page we're reading") Cc: [email protected] Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Signed-off-by: David Howells <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
elockman · Nov 5, 2020 · 81190a9 · 81190a9
1 parent 4bf2a74
commit 81190a9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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);