Skip to content

Commit

Permalink
NFS: O_DIRECT pgio_completion_ops error_cleanup must unlock the request
Browse files Browse the repository at this point in the history
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Apr 30, 2012
1 parent 71e8cc0 commit 3e9e0ca
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions fs/nfs/direct.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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,
};
Expand Down Expand Up @@ -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,
};
Expand Down

0 comments on commit 3e9e0ca

Please sign in to comment.