Skip to content

Commit

Permalink
Fix compile error due to congestion_wait() changes
Browse files Browse the repository at this point in the history
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 097041e ("fuse:
Fix build error"), which will be reverted.

Signed-off-by: Trond Myklebust <[email protected]>
Acked-by: Larry Finger <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Miklos Szeredi <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Trond Myklebust authored and torvalds committed Jul 11, 2009
1 parent f00caa7 commit 373c0a7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 5 additions & 0 deletions include/linux/backing-dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,11 @@ static inline int bdi_rw_congested(struct backing_dev_info *bdi)
(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 set_bdi_congested(struct backing_dev_info *bdi, int sync);
long congestion_wait(int sync, long timeout);
Expand Down
5 changes: 0 additions & 5 deletions include/linux/blkdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ enum rq_cmd_type_bits {
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
* sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a
Expand Down

0 comments on commit 373c0a7

Please sign in to comment.