summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/ext2fs-simplify-expression.patch12
-rw-r--r--debian/patches/series2
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/ext2fs-simplify-expression.patch b/debian/patches/ext2fs-simplify-expression.patch
index a8c59d7a..c008a3df 100644
--- a/debian/patches/ext2fs-simplify-expression.patch
+++ b/debian/patches/ext2fs-simplify-expression.patch
@@ -1,18 +1,18 @@
-commit 716360ea1ad789678c0395d19b65d073546a5be5
+commit 9cbbaee2abdb1e0b36f8a72e6ef50efadfee5d1e
Author: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Sat Apr 26 12:30:06 2014 +0200
+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 6e99c83..9116b8c 100644
+index febde8f..92e9178 100644
--- a/ext2fs/pager.c
+++ b/ext2fs/pager.c
-@@ -1453,8 +1453,7 @@ diskfs_max_user_pager_prot ()
- if (upi->type == FILE_DATA)
- max_prot |= upi->max_prot;
+@@ -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;
diff --git a/debian/patches/series b/debian/patches/series
index 564cecf1..a2e80372 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,7 +46,7 @@ libdiskfs-default-sync-interval.patch
libports-termination-workaround.patch
libports-reduce-overhead.patch
ext2fs-two-pagers.patch
-#ext2fs-simplify-expression.patch needs refresh ^
+ext2fs-simplify-expression.patch
ext2fs-fix-inum-type.patch
#ext2fs-cache-superblock.patch
exec-abbreviate-task-names.patch