diff --git a/[refs] b/[refs] index c941b785e4d1..fc7cad682907 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e77c485f7037e4817bb53c78d15d5403981ae8b +refs/heads/master: d4569d2e6949a63851032b40c811913d4a6f85f5 diff --git a/trunk/fs/direct-io.c b/trunk/fs/direct-io.c index 910a8ed74b5d..b05d1b218776 100644 --- a/trunk/fs/direct-io.c +++ b/trunk/fs/direct-io.c @@ -929,8 +929,7 @@ static int do_direct_IO(struct dio *dio) block_in_page += this_chunk_blocks; dio->blocks_available -= this_chunk_blocks; next_block: - if (dio->block_in_file > dio->final_block_in_request) - BUG(); + BUG_ON(dio->block_in_file > dio->final_block_in_request); if (dio->block_in_file == dio->final_block_in_request) break; }