From 16d3a0ba4a400301dd285ff802c060db7b9bbdcf Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Fri, 27 Apr 2012 14:31:47 -0400 Subject: [PATCH] --- yaml --- r: 308560 b: refs/heads/master c: 9b5415b536cc3193e9608a7fced1372df8ce4dcf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/pnfs.c | 2 +- trunk/fs/nfs/write.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index add65da707a8..fd590fb58a04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80a16b21a81eb639f0b726549f4c46c0e9aff92e +refs/heads/master: 9b5415b536cc3193e9608a7fced1372df8ce4dcf diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c index 4da05e469be5..39cbac548730 100644 --- a/trunk/fs/nfs/pnfs.c +++ b/trunk/fs/nfs/pnfs.c @@ -1308,7 +1308,7 @@ pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) whdr = nfs_writehdr_alloc(); if (!whdr) { - desc->pg_completion_ops->error_cleanup(&hdr->pages); + desc->pg_completion_ops->error_cleanup(&desc->pg_list); put_lseg(desc->pg_lseg); desc->pg_lseg = NULL; return -ENOMEM; diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index fec214bfa702..3636191c3996 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -1164,7 +1164,7 @@ static int nfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) whdr = nfs_writehdr_alloc(); if (!whdr) { - desc->pg_completion_ops->error_cleanup(&hdr->pages); + desc->pg_completion_ops->error_cleanup(&desc->pg_list); return -ENOMEM; } hdr = &whdr->header;