diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /fs/direct-io.c | |
parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) |
Merge branch 'master'
Diffstat (limited to 'fs/direct-io.c')
-rw-r--r-- | fs/direct-io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c index 910a8ed74b5d..b05d1b218776 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c | |||
@@ -929,8 +929,7 @@ do_holes: | |||
929 | block_in_page += this_chunk_blocks; | 929 | block_in_page += this_chunk_blocks; |
930 | dio->blocks_available -= this_chunk_blocks; | 930 | dio->blocks_available -= this_chunk_blocks; |
931 | next_block: | 931 | next_block: |
932 | if (dio->block_in_file > dio->final_block_in_request) | 932 | BUG_ON(dio->block_in_file > dio->final_block_in_request); |
933 | BUG(); | ||
934 | if (dio->block_in_file == dio->final_block_in_request) | 933 | if (dio->block_in_file == dio->final_block_in_request) |
935 | break; | 934 | break; |
936 | } | 935 | } |