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

Commit e7029206 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

nfs: check wait_on_bit_lock err in page_group_lock 



Return errors from wait_on_bit_lock from nfs_page_group_lock.

Add a bool argument @wait to nfs_page_group_lock. If true, loop over
wait_on_bit_lock until it returns cleanly. If false, return the error
from wait_on_bit_lock.

Signed-off-by: default avatarWeston Andros Adamson <dros@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ec25422c

fs/nfs/pagelist.c

+23 −6
Original line number Diff line number Diff line
@@ -147,17 +147,25 @@ static int nfs_wait_bit_uninterruptible(void *word) 
 * @req - request in group that is to be locked

 *

 * this lock must be held if modifying the page group list

 *

 * returns result from wait_on_bit_lock: 0 on success, < 0 on error

 */

void

nfs_page_group_lock(struct nfs_page *req)

int

nfs_page_group_lock(struct nfs_page *req, bool wait)

{

	struct nfs_page *head = req->wb_head;

	int ret;



	WARN_ON_ONCE(head != head->wb_head);



	wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,

	do {

		ret = wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,

			nfs_wait_bit_uninterruptible,

			TASK_UNINTERRUPTIBLE);

	} while (wait && ret != 0);



	WARN_ON_ONCE(ret > 0);

	return ret;

}



/*
@@ -218,7 +226,7 @@ bool nfs_page_group_sync_on_bit(struct nfs_page *req, unsigned int bit) 
{

	bool ret;



	nfs_page_group_lock(req);

	nfs_page_group_lock(req, true);

	ret = nfs_page_group_sync_on_bit_locked(req, bit);

	nfs_page_group_unlock(req);
@@ -858,8 +866,13 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, 
	struct nfs_page *subreq;

	unsigned int bytes_left = 0;

	unsigned int offset, pgbase;

	int ret;



	nfs_page_group_lock(req);

	ret = nfs_page_group_lock(req, false);

	if (ret < 0) {

		desc->pg_error = ret;

		return 0;

	}



	subreq = req;

	bytes_left = subreq->wb_bytes;
@@ -881,7 +894,11 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, 
			if (desc->pg_recoalesce)

				return 0;

			/* retry add_request for this subreq */

			nfs_page_group_lock(req);

			ret = nfs_page_group_lock(req, false);

			if (ret < 0) {

				desc->pg_error = ret;

				return 0;

			}

			continue;

		}

fs/nfs/write.c

+4 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static bool nfs_page_group_covers_page(struct nfs_page *req) 
	unsigned int pos = 0;

	unsigned int len = nfs_page_length(req->wb_page);



	nfs_page_group_lock(req);

	nfs_page_group_lock(req, true);



	do {

		tmp = nfs_page_group_search_locked(req->wb_head, pos);
@@ -456,7 +456,9 @@ try_again: 
	}



	/* lock each request in the page group */

	nfs_page_group_lock(head);

	ret = nfs_page_group_lock(head, false);

	if (ret < 0)

		return ERR_PTR(ret);

	subreq = head;

	do {

		/*

include/linux/nfs_page.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc, 
extern  int nfs_wait_on_request(struct nfs_page *);

extern	void nfs_unlock_request(struct nfs_page *req);

extern	void nfs_unlock_and_release_request(struct nfs_page *);

extern void nfs_page_group_lock(struct nfs_page *);

extern int nfs_page_group_lock(struct nfs_page *, bool);

extern void nfs_page_group_unlock(struct nfs_page *);

extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int);