diff options
| author | Guillem Jover <guillem@debian.org> | 2005-02-10 05:13:28 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2005-02-10 05:13:28 +0000 |
| commit | 16f5dfa58485bafdb9552a52d6852188723cf69f (patch) | |
| tree | e7d2abcff2e0734979ab1497863a7f6f82f46f6c | |
| parent | 9fe74d5120e0cc2d80c90f991275ef706ee663dc (diff) | |
Remove leftover assert on the block glue.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/20_glue_block_assert.patch | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index aa9a26e..198146f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ gnumach (1:20040915.dfsg.1-2) UNRELEASED; urgency=low Thanks to Regis Boudin <regis.boudin@gmail.com>. * Sync patches with latest ones sent to upstream. * Fix Subversion repository address. + * Remove leftover assert on the block glue. -- Guillem Jover <guillem@debian.org> Mon, 7 Feb 2005 07:37:48 +0100 diff --git a/debian/patches/20_glue_block_assert.patch b/debian/patches/20_glue_block_assert.patch new file mode 100644 index 0000000..bd99113 --- /dev/null +++ b/debian/patches/20_glue_block_assert.patch @@ -0,0 +1,21 @@ +#DPATCHLEVEL=1 + +2005-02-10 Guillem Jover <guillem@hadrons.org> + + * linux/dev/glue/block.c (rdwr_partial): Remove leftover assert. + +The error can be reproduced by "fdisk /dev/hf0". Giving: + + linux/dev/glue/block.c 547 (rdwr_partial): assert(*resid <= c); + +diff -Naur gnumach-20040915.orig/linux/dev/glue/block.c gnumach-20040915/linux/dev/glue/block.c +--- gnumach-20040915.orig/linux/dev/glue/block.c 2005-02-10 05:40:34.000000000 +0100 ++++ gnumach-20040915/linux/dev/glue/block.c 2005-02-10 05:59:14.000000000 +0100 +@@ -544,7 +544,6 @@ rdwr_partial (int rw, kdev_t dev, loff_t + { + o = *off & BMASK; + c = bh->b_size - o; +- assert (*resid <= c); + if (c > *resid) + c = *resid; + if (rw == READ) |