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;