From 42dedbf98f0cc681046426cfb68002b81205a7e4 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 3 Jan 2012 10:09:07 -0800
Subject: [PATCH] --- yaml --- r: 284447 b: refs/heads/master c:
 2ff179e650e95c2b21841b21dc46dc2edefd04cd h: refs/heads/master i:   284445:
 873c72c7ad445cc9b1064c568348f969a1d31c6f   284443:
 da2334252d67eaf31907ec213ccb813b2a6fdc75   284439:
 d0f83ca9caa311f8762c1bcf12f653bd741cbe89   284431:
 d9d08f5fdff9896d91077ed3ef867be713b0c3f2   284415:
 c7a42c4c1fd28dd74c21ce5b4306685bb41095a0 v: v3

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

diff --git a/[refs] b/[refs]
index 5f68fd736bdc..481940e7a902 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee6b1baf67591b6d7ce1a6a07544343433d5ec9e
+refs/heads/master: 2ff179e650e95c2b21841b21dc46dc2edefd04cd
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index a421555b229d..974ef1e4d268 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -1218,6 +1218,7 @@ static int ceph_dir_fsync(struct file *file, loff_t start, loff_t end,
 	do {
 		ceph_mdsc_get_request(req);
 		spin_unlock(&ci->i_unsafe_lock);
+
 		dout("dir_fsync %p wait on tid %llu (until %llu)\n",
 		     inode, req->r_tid, last_tid);
 		if (req->r_timeout) {
@@ -1230,9 +1231,9 @@ static int ceph_dir_fsync(struct file *file, loff_t start, loff_t end,
 		} else {
 			wait_for_completion(&req->r_safe_completion);
 		}
-		spin_lock(&ci->i_unsafe_lock);
 		ceph_mdsc_put_request(req);
 
+		spin_lock(&ci->i_unsafe_lock);
 		if (ret || list_empty(head))
 			break;
 		req = list_entry(head->next,