Merge tag 'upstream/20100701'

2 files changed, 1 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 4971dfd9..ee437ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ hurd (20100701-1) UNRELEASED; urgency=low
     - debian/patches/libpthread_setcancel.patch: Likewise.
     - debian/patches/pfinet-gcc-4.3-fix.patch: Likewise.
     - debian/patches/procfs.patch: Likewise.
+    - debian/patches/ext2fs_large_stores.patch: Resync.
     - debian/patches/libpthread_procfs.patch: New patch, to enable libpthread
       and procfs build.
   * debian/rules: Really put debugging symbols into the hurd-dbg package.
diff --git a/debian/patches/ext2fs_large_stores.patch b/debian/patches/ext2fs_large_stores.patch
index 0f7c6fd7..0855f760 100644
--- a/debian/patches/ext2fs_large_stores.patch
+++ b/debian/patches/ext2fs_large_stores.patch
@@ -1907,17 +1907,6 @@ Support for >2GB volumes
    if (control != p->memobjcntl)
      {
        printf ("incg data request: wrong control port\n");
-@@ -67,9 +67,7 @@ _pager_seqnos_memory_object_data_request
-   if (p->pager_state != NORMAL)
-     {
-       printf ("pager in wrong state for read\n");
--      _pager_release_seqno (p, seqno);
--      mutex_unlock (&p->interlock);
--      goto allow_term_out;
-+      goto allow_release_out;
-     }
- 
-   err = _pager_pagemap_resize (p, offset + length);
 @@ -121,7 +123,8 @@ _pager_seqnos_memory_object_data_request
      goto error_read;