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

Commit 3e9e0ca3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: O_DIRECT pgio_completion_ops error_cleanup must unlock the request 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>
parent 71e8cc00

fs/nfs/direct.c

+15 −3
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr) 
	hdr->release(hdr);

}



static void nfs_sync_pgio_error(struct list_head *head)

static void nfs_read_sync_pgio_error(struct list_head *head)

{

	struct nfs_page *req;
@@ -309,7 +309,7 @@ static void nfs_direct_pgio_init(struct nfs_pgio_header *hdr) 
}



static const struct nfs_pgio_completion_ops nfs_direct_read_completion_ops = {

	.error_cleanup = nfs_sync_pgio_error,

	.error_cleanup = nfs_read_sync_pgio_error,

	.init_hdr = nfs_direct_pgio_init,

	.completion = nfs_direct_read_completion,

};
@@ -775,8 +775,20 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) 
	hdr->release(hdr);

}



static void nfs_write_sync_pgio_error(struct list_head *head)

{

	struct nfs_page *req;



	while (!list_empty(head)) {

		req = nfs_list_entry(head->next);

		nfs_list_remove_request(req);

		nfs_release_request(req);

		nfs_unlock_request(req);

	}

}



static const struct nfs_pgio_completion_ops nfs_direct_write_completion_ops = {

	.error_cleanup = nfs_sync_pgio_error,

	.error_cleanup = nfs_write_sync_pgio_error,

	.init_hdr = nfs_direct_pgio_init,

	.completion = nfs_direct_write_completion,

};