Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 373c0a7ed3ea3b34efedb7c83ffb521adff7c894

Authored by Trond Myklebust
Committed by Linus Torvalds
1 parent f00caa7629
Exists in master and in 40 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, emb_lf-6.6.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Fix compile error due to congestion_wait() changes 

Move the definition of BLK_RW_ASYNC/BLK_RW_SYNC into linux/backing-dev.h
so that it is available to all callers of set/clear_bdi_congested().

This replaces commit 097041e576ee3a50d92dd643ee8ca65bf6a62e21 ("fuse:
Fix build error"), which will be reverted.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 5 additions and 5 deletions Side-by-side Diff

include/linux/backing-dev.h
Diff comments   View file @ 373c0a7
... ... @@ -229,6 +229,11 @@
229 229 (1 << BDI_async_congested));
230 230 }
231 231  
  232 +enum {
  233 + BLK_RW_ASYNC = 0,
  234 + BLK_RW_SYNC = 1,
  235 +};
  236 +
232 237 void clear_bdi_congested(struct backing_dev_info *bdi, int sync);
233 238 void set_bdi_congested(struct backing_dev_info *bdi, int sync);
234 239 long congestion_wait(int sync, long timeout);
include/linux/blkdev.h
Diff comments   View file @ 373c0a7
... ... @@ -70,11 +70,6 @@
70 70 REQ_TYPE_ATA_PC,
71 71 };
72 72  
73   -enum {
74   - BLK_RW_ASYNC = 0,
75   - BLK_RW_SYNC = 1,
76   -};
77   -
78 73 /*
79 74 * For request of type REQ_TYPE_LINUX_BLOCK, rq->cmd[0] is the opcode being
80 75 * sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a