From 352a7149c87d9dc19e92be256b98d3c1dcf33c01 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 12 May 2011 15:43:48 -0700
Subject: [PATCH] --- yaml --- r: 251311 b: refs/heads/master c:
 6b4a3b517a767c483d16a200730b2967e0e23b83 h: refs/heads/master i:   251309:
 6aea16342f7448eee37efea2465951d279831014   251307:
 297eccd51415522bfbc7f4b2a94f2079d0b7cbc8   251303:
 88b502147b1c1eb014c0bb0320a4a80baeb19549   251295:
 98a85a29a66b4a3ae88dba39d9411f50c660381a v: v3

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

diff --git a/[refs] b/[refs]
index 4f70ce762b8f..c89770b555f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2a79609c044d3ddb540671d5029a41c90c57251
+refs/heads/master: 6b4a3b517a767c483d16a200730b2967e0e23b83
diff --git a/trunk/fs/ceph/addr.c b/trunk/fs/ceph/addr.c
index 38b8ab554924..54967268a340 100644
--- a/trunk/fs/ceph/addr.c
+++ b/trunk/fs/ceph/addr.c
@@ -880,8 +880,6 @@ static int ceph_writepages_start(struct address_space *mapping,
 out:
 	if (req)
 		ceph_osdc_put_request(req);
-	if (rc > 0)
-		rc = 0;  /* vfs expects us to return 0 */
 	ceph_put_snap_context(snapc);
 	dout("writepages done, rc = %d\n", rc);
 	return rc;