2013-06-19 07:12:12

by majianpeng

Subject: [PATCH] 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(-)

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 3e68ac1..25fa8b8 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -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,
--
1.8.3.rc1.44.gb387c77
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2013-06-19 15:57:39

by Sage Weil

Subject: Re: [PATCH] ceph: avoid meaningless calling ceph_caps_revoking if sync_mode == WB_SYNC_ALL.

Applied, thanks!

sage

On Wed, 19 Jun 2013, majianpeng wrote:

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