提交 373c0a7e 编写于 作者: T Trond Myklebust 提交者: Linus Torvalds

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 097041e5 ("fuse:
Fix build error"), which will be reverted.
Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: NLarry Finger <Larry.Finger@lwfinger.net>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 f00caa76
...@@ -229,6 +229,11 @@ static inline int bdi_rw_congested(struct backing_dev_info *bdi) ...@@ -229,6 +229,11 @@ static inline int bdi_rw_congested(struct backing_dev_info *bdi)
(1 << BDI_async_congested)); (1 << BDI_async_congested));
} }
enum {
BLK_RW_ASYNC = 0,
BLK_RW_SYNC = 1,
};
void clear_bdi_congested(struct backing_dev_info *bdi, int sync); void clear_bdi_congested(struct backing_dev_info *bdi, int sync);
void set_bdi_congested(struct backing_dev_info *bdi, int sync); void set_bdi_congested(struct backing_dev_info *bdi, int sync);
long congestion_wait(int sync, long timeout); long congestion_wait(int sync, long timeout);
......
...@@ -70,11 +70,6 @@ enum rq_cmd_type_bits { ...@@ -70,11 +70,6 @@ enum rq_cmd_type_bits {
REQ_TYPE_ATA_PC, REQ_TYPE_ATA_PC,
}; };
enum {
BLK_RW_ASYNC = 0,
BLK_RW_SYNC = 1,
};
/* /*
* For request of type REQ_TYPE_LINUX_BLOCK, rq->cmd[0] is the opcode being * For request of type REQ_TYPE_LINUX_BLOCK, rq->cmd[0] is the opcode being
* sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a * sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册