Skip to contentSkip to conversation

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

PATCH Applied majianpeng 2 participants 2 messages Jun 19, 2013 Ceph client

lore
Share & tools
lore

majianpeng

author
#0 lore raw

PATCH 1/1 ceph: avoid meaningless calling ceph_caps_revoking if sync_mode == WB_SYNC_ALL.

Signed-off-by Jianpeng Ma <[email protected]>
---
 fs/ceph/addr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ceph/addr.c +2 -2
index 3e68ac1..25fa8b8 100644
@@ -677,8 +677,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,
Signature · 1 line
1.8.3.rc1.44.gb387c77
Applied
#1 lore raw

Applied, thanks!

sage

Quoted 23 lines · majianpeng
Signed-off-by Jianpeng Ma <[email protected]>
---
 fs/ceph/addr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ceph/addr.c +2 -2
index 3e68ac1..25fa8b8 100644
@@ -677,8 +677,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,
Signature · 2 lines
1.8.3.rc1.44.gb387c77
N????y????b?????v?????{.n??????z??ay????????j???f????????????????:+v??????????zZ+??????"?!?