From 2447dc586882a1411bc495ec3189b40a20a2b5b2 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 5 May 2010 21:30:35 -0700
Subject: [PATCH] --- yaml --- r: 190803 b: refs/heads/master c:
 54ad023ba8108d0163acc931ed4b5e4a8a3a7327 h: refs/heads/master i:   190801:
 ece9fd644ef19a52bf979b354ff9193546cc3819   190799:
 8be44699fcab490627c04fe036a04e8b2ffeadae v: v3

---
 [refs]                     | 2 +-
 trunk/fs/ceph/addr.c       | 6 ------
 trunk/fs/ceph/osd_client.h | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 139832dbb8ef..28da73695e22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dfc589a8467470226feccdc50f1b32713318e7b
+refs/heads/master: 54ad023ba8108d0163acc931ed4b5e4a8a3a7327
diff --git a/trunk/fs/ceph/addr.c b/trunk/fs/ceph/addr.c
index 4b42c2bb603f..a9005d862ed4 100644
--- a/trunk/fs/ceph/addr.c
+++ b/trunk/fs/ceph/addr.c
@@ -504,7 +504,6 @@ static void writepages_finish(struct ceph_osd_request *req,
 	int i;
 	struct ceph_snap_context *snapc = req->r_snapc;
 	struct address_space *mapping = inode->i_mapping;
-	struct writeback_control *wbc = req->r_wbc;
 	__s32 rc = -EIO;
 	u64 bytes = 0;
 	struct ceph_client *client = ceph_inode_to_client(inode);
@@ -546,10 +545,6 @@ static void writepages_finish(struct ceph_osd_request *req,
 			clear_bdi_congested(&client->backing_dev_info,
 					    BLK_RW_ASYNC);
 
-		if (i >= wrote) {
-			dout("inode %p skipping page %p\n", inode, page);
-			wbc->pages_skipped++;
-		}
 		ceph_put_snap_context((void *)page->private);
 		page->private = 0;
 		ClearPagePrivate(page);
@@ -799,7 +794,6 @@ static int ceph_writepages_start(struct address_space *mapping,
 				alloc_page_vec(client, req);
 				req->r_callback = writepages_finish;
 				req->r_inode = inode;
-				req->r_wbc = wbc;
 			}
 
 			/* note position of first page in pvec */
diff --git a/trunk/fs/ceph/osd_client.h b/trunk/fs/ceph/osd_client.h
index b0759911e7c3..c5191d62f243 100644
--- a/trunk/fs/ceph/osd_client.h
+++ b/trunk/fs/ceph/osd_client.h
@@ -66,7 +66,6 @@ struct ceph_osd_request {
 	struct list_head  r_unsafe_item;
 
 	struct inode *r_inode;         	      /* for use by callbacks */
-	struct writeback_control *r_wbc;      /* ditto */
 
 	char              r_oid[40];          /* object name */
 	int               r_oid_len;