From cd01153ce1db84273db2a4f2f2a14fb64e9e77de Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Mon, 15 Apr 2013 11:18:01 -0500
Subject: [PATCH] --- yaml --- r: 373456 b: refs/heads/master c:
 7d7d51ce14fde491a6d0677d9bded9b3bd0d21d9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 24ae6c843637..853efbcc54b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b93267252ef5fe6c6d77e3013ed6a0d766352ad
+refs/heads/master: 7d7d51ce14fde491a6d0677d9bded9b3bd0d21d9
diff --git a/trunk/fs/ceph/file.c b/trunk/fs/ceph/file.c
index 0f9c4095614b..ae23e31a8f38 100644
--- a/trunk/fs/ceph/file.c
+++ b/trunk/fs/ceph/file.c
@@ -595,12 +595,6 @@ static ssize_t ceph_sync_write(struct file *file, const char __user *data,
 		}
 		
 		ret = ceph_osdc_wait_request(&fsc->client->osdc, req);
-		if (ret < 0 && req->r_safe_callback) {
-			spin_lock(&ci->i_unsafe_lock);
-			list_del_init(&req->r_unsafe_item);
-			spin_unlock(&ci->i_unsafe_lock);
-			ceph_put_cap_refs(ci, CEPH_CAP_FILE_WR);
-		}
 	}
 
 	if (file->f_flags & O_DIRECT)