Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f14e20c authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Greg Kroah-Hartman
Browse files

cachefiles: Handle readpage error correctly 



commit 9480b4e75b7108ee68ecf5bc6b4bd68e8031c521 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 87ae7881

fs/cachefiles/rdwr.c

+2 −1
Original line number Diff line number Diff line
@@ -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);