From: Bobi Jam Date: Sun, 2 Oct 2011 08:08:56 +0000 (+0800) Subject: LU-651 osc: suppress message in can_merge_pages() X-Git-Tag: 2.1.53~43 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6f8e1b7c5a10862dc12265cb500803d1c19b5019 LU-651 osc: suppress message in can_merge_pages() Thottle messages if adjacent brw pages are not mergeable with different OBD_BRW_NOQUOTA flags. Change-Id: I22ce6f8807e2541d3e6b3c9631f60faa36baa81a Signed-off-by: Bobi Jam Reviewed-on: http://review.whamcloud.com/1328 Tested-by: Hudson Reviewed-by: Andreas Dilger Reviewed-by: Johann Lombardi Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index bc1243b..a0d45b5 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -1219,14 +1219,16 @@ static int check_write_rcs(struct ptlrpc_request *req, static inline int can_merge_pages(struct brw_page *p1, struct brw_page *p2) { if (p1->flag != p2->flag) { - unsigned mask = ~(OBD_BRW_FROM_GRANT| - OBD_BRW_NOCACHE|OBD_BRW_SYNC|OBD_BRW_ASYNC); + unsigned mask = ~(OBD_BRW_FROM_GRANT| OBD_BRW_NOCACHE| + OBD_BRW_SYNC|OBD_BRW_ASYNC|OBD_BRW_NOQUOTA); /* warn if we try to combine flags that we don't know to be * safe to combine */ - if ((p1->flag & mask) != (p2->flag & mask)) - CERROR("is it ok to have flags 0x%x and 0x%x in the " - "same brw?\n", p1->flag, p2->flag); + if (unlikely((p1->flag & mask) != (p2->flag & mask))) { + CWARN("Saw flags 0x%x and 0x%x in the same brw, please " + "report this at http://bugs.whamcloud.com/\n", + p1->flag, p2->flag); + } return 0; }