|
@@ -0,0 +1,41 @@
|
|
|
+From 876d9b0c8eac2fd80dd62bfa1b09adea62aa08f3 Mon Sep 17 00:00:00 2001
|
|
|
+From: Theodore Ts'o <tytso@mit.edu>
|
|
|
+Date: Wed, 3 Jan 2018 01:32:02 -0500
|
|
|
+Subject: [PATCH] libext2fs: fix build failure in swapfs.c on big-endian
|
|
|
+ systems
|
|
|
+
|
|
|
+Addresses-Debian-Bug: #886119
|
|
|
+
|
|
|
+Reported-by: James Clarke <jrtc27@debian.org>
|
|
|
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
|
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
|
+---
|
|
|
+Patch status: upstream commit 876d9b0c8eac
|
|
|
+
|
|
|
+ lib/ext2fs/swapfs.c | 3 ++-
|
|
|
+ 1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
+
|
|
|
+diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
|
|
|
+index 6e5cff97e505..b13dc4229225 100644
|
|
|
+--- a/lib/ext2fs/swapfs.c
|
|
|
++++ b/lib/ext2fs/swapfs.c
|
|
|
+@@ -19,6 +19,7 @@
|
|
|
+
|
|
|
+ #include "ext2_fs.h"
|
|
|
+ #include "ext2fs.h"
|
|
|
++#include "ext2fsP.h"
|
|
|
+ #include <ext2fs/ext2_ext_attr.h>
|
|
|
+
|
|
|
+ #ifdef WORDS_BIGENDIAN
|
|
|
+@@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
|
|
|
+ if (inode_includes(inode_size, i_projid))
|
|
|
+ t->i_projid = ext2fs_swab16(f->i_projid);
|
|
|
+ /* catch new static fields added after i_projid */
|
|
|
+- EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160);
|
|
|
++ EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160);
|
|
|
+
|
|
|
+ i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32);
|
|
|
+ if (bufsize < (int) i)
|
|
|
+--
|
|
|
+2.15.1
|
|
|
+
|