---

yaml --- r: 284447 b: refs/heads/master c: 2ff179e h: refs/heads/master i: 284445: 873c72c 284443: da23342 284439: d0f83ca 284431: d9d08f5 284415: c7a42c4 v: v3
git-mirror · Jan 10, 2012 · 42dedbf · 42dedbf
1 parent 375853d
commit 42dedbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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,