Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 373c0a7e authored by Trond Myklebust's avatar Trond Myklebust Committed by Linus Torvalds
Browse files

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f00caa76

include/linux/backing-dev.h

+5 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/blkdev.h

+0 −5
Original line number Diff line number Diff line
@@ -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