瀏覽代碼

ceph: avoid meaningless calling ceph_caps_revoking if sync_mode == WB_SYNC_ALL.

Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
Reviewed-by: Sage Weil <sage@inktank.com>
majianpeng 12 年之前
父節點
當前提交
c62988ec09
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      fs/ceph/addr.c

+ 2 - 2
fs/ceph/addr.c

@@ -666,8 +666,8 @@ static int ceph_writepages_start(struct address_space *mapping,
 	 * integrity write (e.g., O_SYNC write or fsync()), or if our
 	 * cap is being revoked.
 	 */
-	do_sync = wbc->sync_mode == WB_SYNC_ALL;
-	if (ceph_caps_revoking(ci, CEPH_CAP_FILE_BUFFER))
+	if ((wbc->sync_mode == WB_SYNC_ALL) ||
+		ceph_caps_revoking(ci, CEPH_CAP_FILE_BUFFER))
 		do_sync = 1;
 	dout("writepages_start %p dosync=%d (mode=%s)\n",
 	     inode, do_sync,