tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Trond Myklebust and committed by
Linus Torvalds 373c0a7e f00caa76

+5 -5
+5
include/linux/backing-dev.h
··· 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);
-5
include/linux/blkdev.h
··· 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