rm patches merged upstream

5 files changed, 0 insertions, 228 deletions

diff --git a/debian/patches/ext2fs-improve-diskfs_node_iterate.patch b/debian/patches/ext2fs-improve-diskfs_node_iterate.patch
deleted file mode 100644
index 7c13875a..00000000
--- a/debian/patches/ext2fs-improve-diskfs_node_iterate.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 32b44fe56dab88f63df72bd15b8e0e57be756b2e
-Author: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date:   Tue Apr 29 18:28:22 2014 +0200
-
-    ext2fs: improve diskfs_node_iterate
-    
-    Currently, diskfs_node_iterate iterates twice over all nodes in the
-    cache.  The first time only to determine the number of nodes currently
-    in the cache.  Simply count them instead.
-    
-    * ext2fs/inode.c (nodehash_nr_items): New variable.
-    (diskfs_cached_lookup): Increment nodehash_nr_items.
-    (diskfs_node_norefs): Decrement nodehash_nr_items.
-    (diskfs_node_iterate): Fix the type of num_nodes, use nodehash_nr_items.
-
-diff --git a/ext2fs/inode.c b/ext2fs/inode.c
-index e75c63f..ed78265 100644
---- a/ext2fs/inode.c
-+++ b/ext2fs/inode.c
-@@ -47,6 +47,7 @@
- #endif
- 
- static struct node *nodehash[INOHSZ];
-+static size_t nodehash_nr_items;
- 
- static error_t read_node (struct node *np);
- 
-@@ -106,6 +107,7 @@ diskfs_cached_lookup (ino_t inum, struct node **npp)
-     dn->hnext->dn->hprevp = &dn->hnext;
-   dn->hprevp = &nodehash[INOHASH(inum)];
-   nodehash[INOHASH(inum)] = np;
-+  nodehash_nr_items += 1;
- 
-   pthread_spin_unlock (&diskfs_node_refcnt_lock);
- 
-@@ -159,6 +161,7 @@ diskfs_node_norefs (struct node *np)
-   *np->dn->hprevp = np->dn->hnext;
-   if (np->dn->hnext)
-     np->dn->hnext->dn->hprevp = np->dn->hprevp;
-+  nodehash_nr_items -= 1;
- 
-   if (np->dn->dirents)
-     free (np->dn->dirents);
-@@ -549,7 +552,8 @@ error_t
- diskfs_node_iterate (error_t (*fun)(struct node *))
- {
-   error_t err = 0;
--  int n, num_nodes = 0;
-+  int n;
-+  size_t num_nodes;
-   struct node *node, **node_list, **p;
- 
-   pthread_spin_lock (&diskfs_node_refcnt_lock);
-@@ -559,10 +563,7 @@ diskfs_node_iterate (error_t (*fun)(struct node *))
-      during processing (normally we delegate access to hash-table with
-      diskfs_node_refcnt_lock, but we can't hold this while locking the
-      individual node locks).  */
--
--  for (n = 0; n < INOHSZ; n++)
--    for (node = nodehash[n]; node; node = node->dn->hnext)
--      num_nodes++;
-+  num_nodes = nodehash_nr_items;
- 
-   /* TODO This method doesn't scale beyond a few dozen nodes and should be
-      replaced.  */
diff --git a/debian/patches/fatfs-improve-diskfs_node_iterate.patch b/debian/patches/fatfs-improve-diskfs_node_iterate.patch
deleted file mode 100644
index da39f92d..00000000
--- a/debian/patches/fatfs-improve-diskfs_node_iterate.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-commit d54ad18d9783729ffd7a54458bb0b941f3f14f75
-Author: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date:   Wed Apr 30 02:04:31 2014 +0200
-
-    fatfs: improve diskfs_node_iterate
-    
-    Currently, diskfs_node_iterate iterates twice over all nodes in the
-    cache.  The first time only to determine the number of nodes currently
-    in the cache.  Simply count them instead.
-    
-    * fatfs/inode.c (nodehash_nr_items): New variable.
-    (diskfs_cached_lookup): Increment nodehash_nr_items.
-    (diskfs_cached_lookup_in_dirbuf): Likewise.
-    (diskfs_node_norefs): Decrement nodehash_nr_items.
-    (diskfs_node_iterate): Fix the type of num_nodes, use nodehash_nr_items.
-
-diff --git a/fatfs/inode.c b/fatfs/inode.c
-index 4229806..ed6f3f0 100644
---- a/fatfs/inode.c
-+++ b/fatfs/inode.c
-@@ -45,6 +45,7 @@
- #endif
- 
- static struct node *nodehash[INOHSZ];
-+static size_t nodehash_nr_items;
- 
- static error_t read_node (struct node *np, vm_address_t buf);
- 
-@@ -106,6 +107,7 @@ diskfs_cached_lookup (ino64_t inum, struct node **npp)
-     dn->hnext->dn->hprevp = &dn->hnext;
-   dn->hprevp = &nodehash[INOHASH(inum)];
-   nodehash[INOHASH(inum)] = np;
-+  nodehash_nr_items += 1;
- 
-   pthread_spin_unlock (&diskfs_node_refcnt_lock);
-   
-@@ -171,6 +173,7 @@ diskfs_cached_lookup_in_dirbuf (int inum, struct node **npp, vm_address_t buf)
-     dn->hnext->dn->hprevp = &dn->hnext;
-   dn->hprevp = &nodehash[INOHASH(inum)];
-   nodehash[INOHASH(inum)] = np;
-+  nodehash_nr_items += 1;
- 
-   pthread_spin_unlock (&diskfs_node_refcnt_lock);
-   
-@@ -216,7 +219,8 @@ diskfs_node_norefs (struct node *np)
-   *np->dn->hprevp = np->dn->hnext;
-   if (np->dn->hnext)
-     np->dn->hnext->dn->hprevp = np->dn->hprevp;
--  
-+  nodehash_nr_items -= 1;
-+
-   while (last)
-     {
-       struct cluster_chain *next = last->next;
-@@ -546,7 +550,8 @@ error_t
- diskfs_node_iterate (error_t (*fun)(struct node *))
- {
-   error_t err = 0;
--  int n, num_nodes = 0;
-+  int n;
-+  size_t num_nodes;
-   struct node *node, **node_list, **p;
- 
-   pthread_spin_lock (&diskfs_node_refcnt_lock);
-@@ -557,9 +562,7 @@ diskfs_node_iterate (error_t (*fun)(struct node *))
-      diskfs_node_refcnt_lock, but we can't hold this while locking the
-      individual node locks).  */
- 
--  for (n = 0; n < INOHSZ; n++)
--    for (node = nodehash[n]; node; node = node->dn->hnext)
--      num_nodes++;
-+  num_nodes = nodehash_nr_items;
- 
-   node_list = alloca (num_nodes * sizeof (struct node *));
-   p = node_list;
diff --git a/debian/patches/fatfs-simplify-expr.patch b/debian/patches/fatfs-simplify-expr.patch
deleted file mode 100644
index e0325db5..00000000
--- a/debian/patches/fatfs-simplify-expr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 2dfdb4737f65a4e969f445f4b19008cf2c17895e
-Author: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date:   Wed Apr 30 01:13:47 2014 +0200
-
-    fatfs: simplify expression
-    
-    * fatfs/pager.c (add_pager_max_prot): Simplify expression.
-
-diff --git a/fatfs/pager.c b/fatfs/pager.c
-index 8146e64..6180aac 100644
---- a/fatfs/pager.c
-+++ b/fatfs/pager.c
-@@ -1008,8 +1008,7 @@ diskfs_max_user_pager_prot ()
-             max_prot |= upi->max_prot;
-           /* Stop iterating if MAX_PROT is as filled as it is going to
- 	     get.  */
--          return (max_prot
--		  == (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)) ? 1 : 0;
-+          return max_prot == (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-         }
- 
-       disable_caching ();               /* Make any silly pagers go away.  */
diff --git a/debian/patches/series b/debian/patches/series
index d984ad4e..893024ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,12 +42,8 @@ xkb-compat.patch
 mach-defpager-protected-payload.patch
 
 ext2fs-two-pagers.patch
-fatfs-simplify-expr.patch
 fatfs-two-pagers.patch
 #ext2fs-cache-superblock.patch
 libpager-singlethreaded.patch
 libpager-drop-seqnos.patch
-ext2fs-improve-diskfs_node_iterate.patch
-fatfs-improve-diskfs_node_iterate.patch
-tmpfs-improve-diskfs_node_iterate.patch
 xxx-fix-build-paper-over-gnumach-bug.patch
diff --git a/debian/patches/tmpfs-improve-diskfs_node_iterate.patch b/debian/patches/tmpfs-improve-diskfs_node_iterate.patch
deleted file mode 100644
index 7b6c05b6..00000000
--- a/debian/patches/tmpfs-improve-diskfs_node_iterate.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit eeaf6d931ce4227c45188dc2b1a9b3ce5e8f10fb
-Author: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date:   Wed Apr 30 02:08:41 2014 +0200
-
-    tmpfs: improve diskfs_node_iterate
-    
-    Currently, diskfs_node_iterate iterates twice over all nodes.  The
-    first time only to determine the number of nodes.  Simply count them
-    instead.
-    
-    * tmpfs/node.c (all_nodes_nr_items): New variable.
-    (diskfs_free_node): Decrement all_nodes_nr_items.
-    (diskfs_node_norefs): Likewise.
-    (diskfs_cached_lookup): Increment all_nodes_nr_items.
-    (diskfs_node_iterate): Use all_nodes_nr_items.
-
-diff --git a/tmpfs/node.c b/tmpfs/node.c
-index bc0ad64..18b73be 100644
---- a/tmpfs/node.c
-+++ b/tmpfs/node.c
-@@ -30,6 +30,7 @@ unsigned int num_files;
- static unsigned int gen;
- 
- struct node *all_nodes;
-+static size_t all_nodes_nr_items;
- 
- error_t
- diskfs_alloc_node (struct node *dp, mode_t mode, struct node **npp)
-@@ -77,6 +78,7 @@ diskfs_free_node (struct node *np, mode_t mode)
-   *np->dn->hprevp = np->dn->hnext;
-   if (np->dn->hnext != 0)
-     np->dn->hnext->dn->hprevp = np->dn->hprevp;
-+  all_nodes_nr_items -= 1;
-   free (np->dn);
-   np->dn = 0;
- 
-@@ -120,6 +122,7 @@ diskfs_node_norefs (struct node *np)
-       *np->dn->hprevp = np->dn->hnext;
-       if (np->dn->hnext != 0)
- 	np->dn->hnext->dn->hprevp = np->dn->hprevp;
-+      all_nodes_nr_items -= 1;
-       np->dn->hnext = 0;
-       np->dn->hprevp = 0;
-     }
-@@ -186,6 +189,7 @@ diskfs_cached_lookup (ino_t inum, struct node **npp)
- 	dn->hnext->dn->hprevp = &dn->hnext;
-       dn->hprevp = &all_nodes;
-       all_nodes = np;
-+      all_nodes_nr_items += 1;
-       pthread_spin_unlock (&diskfs_node_refcnt_lock);
- 
-       st = &np->dn_stat;
-@@ -233,8 +237,7 @@ diskfs_node_iterate (error_t (*fun) (struct node *))
-      diskfs_node_refcnt_lock, but we can't hold this while locking the
-      individual node locks).  */
- 
--  for (node = all_nodes; node != 0; node = node->dn->hnext)
--    num_nodes++;
-+  num_nodes = all_nodes_nr_items;
- 
-   p = node_list = alloca (num_nodes * sizeof (struct node *));
-   for (node = all_nodes; node != 0; node = node->dn->hnext)