diff options
| -rw-r--r-- | debian/patches/exec-abbreviate-task-names.patch | 36 | ||||
| -rw-r--r-- | debian/patches/ext2fs-fix-inum-type.patch | 27 | ||||
| -rw-r--r-- | debian/patches/ext2fs-simplify-expression.patch | 22 | ||||
| -rw-r--r-- | debian/patches/libdiskfs-default-sync-interval.patch | 28 | ||||
| -rw-r--r-- | debian/patches/libports-termination-workaround.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 5 |
6 files changed, 0 insertions, 156 deletions
diff --git a/debian/patches/exec-abbreviate-task-names.patch b/debian/patches/exec-abbreviate-task-names.patch deleted file mode 100644 index 24cedfe9..00000000 --- a/debian/patches/exec-abbreviate-task-names.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 9948e87495f1c52d52aabd6d3465fc9431ff6b43 -Author: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Sun Apr 27 08:43:17 2014 +0200 - - exec: abbreviate the task name if necessary - - * exec/exec.c (do_exec): If the formatted task name exceeds - TASK_NAME_SIZE, abbreviate it. - -diff --git a/exec/exec.c b/exec/exec.c -index 935762e..b068f5e 100644 ---- a/exec/exec.c -+++ b/exec/exec.c -@@ -1168,9 +1168,20 @@ do_exec (file_t file, - goto out; - - char *name; -- if (asprintf (&name, "%s(%d)", argv, pid) > 0) -+ int size = asprintf (&name, "%s(%d)", argv, pid); -+ if (size > 0) - { -- task_set_name (newtask, name); -+/* This is an internal implementational detail of the gnumach kernel. */ -+#define TASK_NAME_SIZE 32 -+ if (size < TASK_NAME_SIZE) -+ task_set_name (newtask, name); -+ else -+ { -+ char *abbr = name + size - TASK_NAME_SIZE + 1; -+ abbr[0] = abbr[1] = abbr[2] = '.'; -+ task_set_name (newtask, abbr); -+ } -+#undef TASK_NAME_SIZE - free (name); - } - } diff --git a/debian/patches/ext2fs-fix-inum-type.patch b/debian/patches/ext2fs-fix-inum-type.patch deleted file mode 100644 index 76d5854c..00000000 --- a/debian/patches/ext2fs-fix-inum-type.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 2e154e16471763936be42874f464e41cd56a2f0c -Author: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Thu Apr 24 17:32:04 2014 +0200 - - ext2fs: fix type of inum - - Previously, inum was of type int, whereas dino_ref expects ino_t. On - Hurd/x86 the former is 32 bit wide, the latter 64. If dino_ref is - inlined, this does not seem to pose a problem, but if ext2fs is - compiled with -O0, this most likely results in an invalid memory access. - - * ext2fs/ialloc.c (ext2_alloc_inode): Use type ino_t for inum. - -diff --git a/ext2fs/ialloc.c b/ext2fs/ialloc.c -index 2d8e51e..52212d5 100644 ---- a/ext2fs/ialloc.c -+++ b/ext2fs/ialloc.c -@@ -115,7 +115,8 @@ ino_t - ext2_alloc_inode (ino_t dir_inum, mode_t mode) - { - char *bh = NULL; -- int i, j, inum, avefreei; -+ int i, j, avefreei; -+ ino_t inum; - struct ext2_group_desc *gdp; - struct ext2_group_desc *tmp; - diff --git a/debian/patches/ext2fs-simplify-expression.patch b/debian/patches/ext2fs-simplify-expression.patch deleted file mode 100644 index c008a3df..00000000 --- a/debian/patches/ext2fs-simplify-expression.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 9cbbaee2abdb1e0b36f8a72e6ef50efadfee5d1e -Author: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Sun Apr 27 13:52:20 2014 +0200 - - ext2fs: simplify expression - - * ext2fs/pager.c (add_pager_max_prot): Simplify expression. - -diff --git a/ext2fs/pager.c b/ext2fs/pager.c -index febde8f..92e9178 100644 ---- a/ext2fs/pager.c -+++ b/ext2fs/pager.c -@@ -1488,8 +1488,7 @@ diskfs_max_user_pager_prot () - struct user_pager_info *upi = pager_get_upi (p); - max_prot |= upi->max_prot; - /* Stop iterating if MAX_PROT is as filled as it's 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/libdiskfs-default-sync-interval.patch b/debian/patches/libdiskfs-default-sync-interval.patch deleted file mode 100644 index d17c692b..00000000 --- a/debian/patches/libdiskfs-default-sync-interval.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit d1ce071b40e990af1dd2ad4d980c832518c72b0a -Author: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Sat Apr 26 13:16:23 2014 +0200 - - libdiskfs: set the default sync interval to 30 seconds - - The default sync interval has been changed in 9e55fdd7 from 30 to 5 - seconds. This change was not reflected in the documentation. - - At least for current hardware, using 30 seconds instead of just 5 - alleviates the thread-storm problem. Make 30 seconds the default - again. - - * libdiskfs/priv.h (DEFAULT_SYNC_INTERVAL): Set to 30 seconds. - -diff --git a/libdiskfs/priv.h b/libdiskfs/priv.h -index 4363a00..2ac3c9e 100644 ---- a/libdiskfs/priv.h -+++ b/libdiskfs/priv.h -@@ -63,7 +63,7 @@ extern const struct argp_option diskfs_common_options[]; - #define OPT_INHERIT_DIR_GROUP 604 /* --inherit-dir-group */ - - /* Common value for diskfs_common_options and diskfs_default_sync_interval. */ --#define DEFAULT_SYNC_INTERVAL 5 -+#define DEFAULT_SYNC_INTERVAL 30 - #define DEFAULT_SYNC_INTERVAL_STRING STRINGIFY(DEFAULT_SYNC_INTERVAL) - #define STRINGIFY(x) STRINGIFY_1(x) - #define STRINGIFY_1(x) #x diff --git a/debian/patches/libports-termination-workaround.patch b/debian/patches/libports-termination-workaround.patch deleted file mode 100644 index 196ca7b0..00000000 --- a/debian/patches/libports-termination-workaround.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit cf01d40fb9e540c21138d40b8d3d5a4d1ac683c6 -Author: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Thu Apr 17 15:43:11 2014 +0200 - - libports: work around bugs in server termination - - Some servers use ports_manage_port_operations_one_thread to process - requests and terminate when it returns. Since many of them don't detach - before shutting down, a client may receive an error if its request - arrived while the server is shutting down. Prevent those spurious errors - by forcing ports_manage_port_operations_one_thread not to return. - - This is the same change as 235491231bdd1fd93507c835767503f047e10b91 - introduced for ports_manage_port_operations_multithread. - - * libports/manage-one-thread.c - (ports_manage_port_operations_one_thread): Force timeout to 0. - -diff --git a/libports/manage-one-thread.c b/libports/manage-one-thread.c -index 4ea740b..cbd2df7 100644 ---- a/libports/manage-one-thread.c -+++ b/libports/manage-one-thread.c -@@ -85,7 +85,14 @@ ports_manage_port_operations_one_thread (struct port_bucket *bucket, - - return status; - } -- -+ -+ /* XXX It is currently unsafe for most servers to terminate based on -+ inactivity because a request may arrive after a server has -+ started shutting down, causing the client to receive an error. -+ Prevent the service loop from terminating by setting TIMEOUT to -+ zero. */ -+ timeout = 0; -+ - do - err = mach_msg_server_timeout (internal_demuxer, 0, bucket->portset, - timeout ? MACH_RCV_TIMEOUT : 0, timeout); diff --git a/debian/patches/series b/debian/patches/series index a2e80372..2184b1b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,13 +42,8 @@ xkb-compat.patch xxx-fix-build.patch mach-defpager-protected-payload.patch -libdiskfs-default-sync-interval.patch -libports-termination-workaround.patch libports-reduce-overhead.patch ext2fs-two-pagers.patch -ext2fs-simplify-expression.patch -ext2fs-fix-inum-type.patch #ext2fs-cache-superblock.patch -exec-abbreviate-task-names.patch libpager-singlethreaded.patch libpager-drop-seqnos.patch |