diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-13 15:22:02 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-13 15:22:02 -0400 |
| commit | e655f945cd7ba2a8360ddd5462ca535a3b41e07e (patch) | |
| tree | c4ea74ad13b1c0a1956bdcf507ef26de70f35511 /fs/nfs/direct.c | |
| parent | 00cfaa943ec30abbc7109b0b918e0b6a0eef07dc (diff) | |
| parent | f563b89b182594f827b4100bd34f916339785a77 (diff) | |
| download | lwn-e655f945cd7ba2a8360ddd5462ca535a3b41e07e.tar.gz lwn-e655f945cd7ba2a8360ddd5462ca535a3b41e07e.zip | |
Merge branch 'bugfixes' into linux-next
* bugfixes:
NFS: Don't reset pg_moreio in __nfs_pageio_add_request
NFS: Remove 2 unused variables
nfs: handle multiple reqs in nfs_wb_page_cancel
nfs: handle multiple reqs in nfs_page_async_flush
nfs: change find_request to find_head_request
nfs: nfs_page should take a ref on the head req
nfs: mark nfs_page reqs with flag for extra ref
nfs: only show Posix ACLs in listxattr if actually present
Conflicts:
fs/nfs/write.c
Diffstat (limited to 'fs/nfs/direct.c')
| -rw-r--r-- | fs/nfs/direct.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 2a3293a5dda0..65ef6e00deee 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -749,14 +749,12 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) spin_unlock(&dreq->lock); while (!list_empty(&hdr->pages)) { - bool do_destroy = true; req = nfs_list_entry(hdr->pages.next); nfs_list_remove_request(req); if (request_commit) { kref_get(&req->wb_kref); nfs_mark_request_commit(req, hdr->lseg, &cinfo); - do_destroy = false; } nfs_unlock_and_release_request(req); } |