~ubuntu-branches/ubuntu/vivid/aufs/vivid

#! /bin/sh /usr/share/dpatch/dpatch-run
## 11_fix_alpha_s390x.dpatch by Julian Andres Klode <jak@jak-linux.org>
##
## DP: Fix FTBFS of the modules on s390x and alpha (Closes: #494447)
## DP: This patch has been provided by upstream.
## DP: See http://article.gmane.org/gmane.linux.file-systems.aufs.user/1350

@DPATCH@
diff -urNad aufs-0+20080719~/Kconfig.in aufs-0+20080719/Kconfig.in
--- aufs-0+20080719~/Kconfig.in	2008-06-30 05:47:43.000000000 +0200
+++ aufs-0+20080719/Kconfig.in	2008-08-16 18:53:57.000000000 +0200
@@ -120,6 +120,14 @@
 	depends on EXPORTFS = m && AUFS = y
 #endif
 
+/* automatic configuration for internal use */
+config AUFS_INO_T_64
+	bool /* never appear on the menu */
+	/* typedef unsigned long/int __kernel_ino_t */
+	/* alpha and s390x are int */
+	depends on 64BIT && !(ALPHA || S390)
+	default y
+
 config AUFS_ROBR
 	bool "Aufs as an readonly branch of another aufs mount"
 	help
diff -urNad aufs-0+20080719~/fs/aufs25/branch.h aufs-0+20080719/fs/aufs25/branch.h
--- aufs-0+20080719~/fs/aufs25/branch.h	2008-07-14 02:14:00.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/branch.h	2008-08-16 18:53:57.000000000 +0200
@@ -59,8 +59,8 @@
 	unsigned long long	xi_size;	 /* s_maxbytes */
 
 	/* truncation */
-	u64			xi_upper;	/* watermark in bytes */
-	u64			xi_step;	/* to next watermark in bytes */
+	unsigned long long	xi_upper;	/* watermark in bytes */
+	unsigned long long	xi_step;	/* to next watermark in bytes */
 
 	/* truncation */
 	blkcnt_t		xi_upper;	/* watermark in blocks */
@@ -93,7 +93,7 @@
 #endif
 
 	/* mfs mode */
-	u64			br_bytes;
+	unsigned long long	br_bytes;
 
 #ifdef CONFIG_SYSFS
 	/* an entry under sysfs per mount-point */
diff -urNad aufs-0+20080719~/fs/aufs25/cpup.c aufs-0+20080719/fs/aufs25/cpup.c
--- aufs-0+20080719~/fs/aufs25/cpup.c	2008-07-14 02:14:12.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/cpup.c	2008-08-16 18:53:57.000000000 +0200
@@ -954,7 +954,8 @@
 	struct dentry *d, *parent, *h_parent, *gparent, *real_parent;
 
 	LKTRTrace("%.*s, b%d, parent i%lu, locked %p\n",
-		  AuDLNPair(dentry), bdst, parent_ino(dentry), locked);
+		  AuDLNPair(dentry), bdst, (unsigned long)parent_ino(dentry),
+		  locked);
 	sb = dentry->d_sb;
 	AuDebugOn(au_test_ro(sb, bdst, NULL));
 	err = 0;
diff -urNad aufs-0+20080719~/fs/aufs25/debug.c aufs-0+20080719/fs/aufs25/debug.c
--- aufs-0+20080719~/fs/aufs25/debug.c	2008-07-14 02:14:22.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/debug.c	2008-08-16 18:53:57.000000000 +0200
@@ -98,8 +98,8 @@
 	     inode->i_ino, inode->i_sb ? au_sbtype(inode->i_sb) : "??",
 	     atomic_read(&inode->i_count), inode->i_nlink, inode->i_mode,
 	     ntfy,
-	     i_size_read(inode), (u64)inode->i_blocks,
-	     timespec_to_ns(&inode->i_ctime) & 0x0ffff,
+	     i_size_read(inode), (unsigned long long)inode->i_blocks,
+	     (long long)timespec_to_ns(&inode->i_ctime) & 0x0ffff,
 	     inode->i_mapping ? inode->i_mapping->nrpages : 0,
 	     inode->i_state, inode->i_flags, inode->i_generation,
 	     l ? ", wh " : "", l, n);
diff -urNad aufs-0+20080719~/fs/aufs25/export.c aufs-0+20080719/fs/aufs25/export.c
--- aufs-0+20080719~/fs/aufs25/export.c	2008-07-14 02:14:48.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/export.c	2008-08-16 18:53:57.000000000 +0200
@@ -27,10 +27,10 @@
 #include "aufs.h"
 
 union conv {
-#if BITS_PER_LONG == 32
-	__u32 a[1];
-#else
+#ifdef CONFIG_AUFS_INO_T_64
 	__u32 a[2];
+#else
+	__u32 a[1];
 #endif
 	ino_t ino;
 };
@@ -40,7 +40,7 @@
 	union conv u;
 
 	u.a[0] = a[0];
-#if BITS_PER_LONG == 64
+#ifdef CONFIG_AUFS_INO_T_64
 	u.a[1] = a[1];
 #endif
 	return u.ino;
@@ -52,7 +52,7 @@
 
 	u.ino = ino;
 	a[0] = u.a[0];
-#if BITS_PER_LONG == 64
+#ifdef CONFIG_AUFS_INO_T_64
 	a[1] = u.a[1];
 #endif
 }
@@ -61,7 +61,7 @@
 enum {
 	Fh_br_id,
 	Fh_sigen,
-#if BITS_PER_LONG == 64
+#ifdef CONFIG_AUFS_INO_T_64
 	/* support 64bit inode number */
 	Fh_ino1,
 	Fh_ino2,
@@ -96,7 +96,8 @@
 	struct dentry *dentry, *parent;
 	struct inode *inode;
 
-	LKTRTrace("i%lu, diri%lu\n", ino, dir_ino);
+	LKTRTrace("i%lu, diri%lu\n",
+		  (unsigned long)ino, (unsigned long)dir_ino);
 
 	dentry = NULL;
 	inode = ilookup(sb, ino);
@@ -229,7 +230,8 @@
 	struct file *file;
 	int err;
 
-	LKTRTrace("i%lu, diri%lu\n", ino, dir_ino);
+	LKTRTrace("i%lu, diri%lu\n",
+		  (unsigned long)ino, (unsigned long)dir_ino);
 
 	dentry = NULL;
 	dir = ilookup(sb, dir_ino);
diff -urNad aufs-0+20080719~/fs/aufs25/hinotify.c aufs-0+20080719/fs/aufs25/hinotify.c
--- aufs-0+20080719~/fs/aufs25/hinotify.c	2008-07-14 02:15:33.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/hinotify.c	2008-08-16 18:53:57.000000000 +0200
@@ -453,7 +453,7 @@
 	struct au_xino_entry xinoe;
 	int err;
 
-	LKTRTrace("b%d, hi%lu\n", bindex, h_ino);
+	LKTRTrace("b%d, hi%lu\n", bindex, (unsigned long)h_ino);
 	AuDebugOn(!au_opt_test_xino(au_mntflags(sb)));
 
 	inode = NULL;
diff -urNad aufs-0+20080719~/fs/aufs25/inode.c aufs-0+20080719/fs/aufs25/inode.c
--- aufs-0+20080719~/fs/aufs25/inode.c	2008-07-14 02:16:33.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/inode.c	2008-08-16 18:53:57.000000000 +0200
@@ -318,7 +318,7 @@
 		}
 	}
 
-	LKTRTrace("i%lu\n", xinoe.ino);
+	LKTRTrace("i%lu\n", (unsigned long)xinoe.ino);
 	inode = au_iget_locked(sb, xinoe.ino);
 	err = PTR_ERR(inode);
 	if (IS_ERR(inode))
@@ -347,7 +347,7 @@
 		AuWarn1("Un-notified UDBA or repeatedly renamed dir,"
 			" b%d, %s, %.*s, hi%lu, i%lu.\n",
 			bstart, au_sbtype(h_dentry->d_sb), AuDLNPair(dentry),
-			h_ino, xinoe.ino);
+			(unsigned long)h_ino, (unsigned long)xinoe.ino);
 	xinoe.ino = 0;
 	err = au_xino_write0(sb, bstart, h_ino, 0);
 	if (!err) {
diff -urNad aufs-0+20080719~/fs/aufs25/module.c aufs-0+20080719/fs/aufs25/module.c
--- aufs-0+20080719~/fs/aufs25/module.c	2008-07-14 02:16:58.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/module.c	2008-08-16 18:53:57.000000000 +0200
@@ -90,6 +90,11 @@
 	char *p;
 
 	au_debug_init();
+#ifdef CONFIG_AUFS_INO_T_64
+	BUILD_BUG_ON(sizeof(ino_t) != sizeof(long long));
+#else
+	BUILD_BUG_ON(sizeof(ino_t) != sizeof(int));
+#endif
 
 	p = au_esc_chars;
 	for (i = 1; i <= ' '; i++)
diff -urNad aufs-0+20080719~/fs/aufs25/opts.c aufs-0+20080719/fs/aufs25/opts.c
--- aufs-0+20080719~/fs/aufs25/opts.c	2008-07-14 02:17:09.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/opts.c	2008-08-16 18:53:57.000000000 +0200
@@ -310,7 +310,7 @@
 			    struct au_opt_wbr_create *create)
 {
 	int err;
-	u64 ull;
+	unsigned long long ull;
 
 	err = 0;
 	if (!au_match_ull(arg, &ull, 0))
diff -urNad aufs-0+20080719~/fs/aufs25/opts.h aufs-0+20080719/fs/aufs25/opts.h
--- aufs-0+20080719~/fs/aufs25/opts.h	2008-06-16 02:14:28.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/opts.h	2008-08-16 18:53:57.000000000 +0200
@@ -150,14 +150,14 @@
 };
 
 struct au_opt_xino_trunc_v {
-	u64		upper;
-	int		step;
+	unsigned long long	upper;
+	int			step;
 };
 
 struct au_opt_wbr_create {
-	int wbr_create;
-	int mfs_second;
-	u64 mfsrr_watermark;
+	int			wbr_create;
+	int			mfs_second;
+	unsigned long long	mfsrr_watermark;
 };
 
 struct au_opt {
diff -urNad aufs-0+20080719~/fs/aufs25/super.c aufs-0+20080719/fs/aufs25/super.c
--- aufs-0+20080719~/fs/aufs25/super.c	2008-07-14 02:14:48.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/super.c	2008-08-16 18:53:57.000000000 +0200
@@ -62,7 +62,7 @@
 	struct inode *inode;
 	int err;
 
-	LKTRTrace("i%lu\n", ino);
+	LKTRTrace("i%lu\n", (unsigned long)ino);
 
 	inode = iget_locked(sb, ino);
 	if (unlikely(!inode)) {
diff -urNad aufs-0+20080719~/fs/aufs25/super.h aufs-0+20080719/fs/aufs25/super.h
--- aufs-0+20080719~/fs/aufs25/super.h	2008-07-14 02:17:23.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/super.h	2008-08-16 18:53:57.000000000 +0200
@@ -55,8 +55,8 @@
 	unsigned long	mfs_expire;
 	aufs_bindex_t	mfs_bindex;
 
-	u64		mfsrr_bytes;
-	u64		mfsrr_watermark;
+	unsigned long long	mfsrr_bytes;
+	unsigned long long	mfsrr_watermark;
 };
 
 /* sbinfo status flags */
diff -urNad aufs-0+20080719~/fs/aufs25/vdir.c aufs-0+20080719/fs/aufs25/vdir.c
--- aufs-0+20080719~/fs/aufs25/vdir.c	2008-06-30 05:50:21.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/vdir.c	2008-08-16 18:53:57.000000000 +0200
@@ -354,7 +354,8 @@
 	union au_vdir_deblk_p p, *room, deblk_end;
 	struct au_vdir_dehstr *dehstr;
 
-	LKTRTrace("%.*s %d, i%lu, dt%u\n", namelen, name, namelen, ino, d_type);
+	LKTRTrace("%.*s %d, i%lu, dt%u\n",
+		  namelen, name, namelen, (unsigned long)ino, d_type);
 
 	p.deblk = last_deblk(vdir);
 	deblk_end.deblk = p.deblk + 1;
@@ -489,7 +490,7 @@
 	ino_t ino;
 
 	LKTRTrace("%.*s, namelen %d, i%llu, dt%u\n",
-		  namelen, name, namelen, (u64)h_ino, d_type);
+		  namelen, name, namelen, (unsigned long long)h_ino, d_type);
 
 	sb = arg->file->f_dentry->d_sb;
 	bend = arg->bindex;
@@ -697,8 +698,8 @@
 		   && (inode->i_version != vdir->vd_version
 		       || time_after(jiffies, vdir->vd_jiffy + expire))) {
 		LKTRTrace("iver %llu, vdver %lu, exp %lu\n",
-			  inode->i_version, vdir->vd_version,
-			  vdir->vd_jiffy + expire);
+			  (unsigned long long)inode->i_version,
+			  vdir->vd_version, vdir->vd_jiffy + expire);
 		do_read = 1;
 		err = reinit_vdir(vdir);
 		if (unlikely(err))
@@ -907,7 +908,8 @@
 			de = vdir_cache->vd_last.p.de;
 			LKTRTrace("%.*s, off%lld, i%lu, dt%d\n",
 				  de->de_str.len, de->de_str.name,
-				  file->f_pos, de->de_ino, de->de_type);
+				  file->f_pos, (unsigned long)de->de_ino,
+				  de->de_type);
 			err = filldir(dirent, de->de_str.name, de->de_str.len,
 				      file->f_pos, de->de_ino, de->de_type);
 			if (unlikely(err)) {
diff -urNad aufs-0+20080719~/fs/aufs25/wbr_policy.c aufs-0+20080719/fs/aufs25/wbr_policy.c
--- aufs-0+20080719~/fs/aufs25/wbr_policy.c	2008-07-07 03:12:39.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/wbr_policy.c	2008-08-16 18:53:57.000000000 +0200
@@ -368,7 +368,7 @@
 	aufs_bindex_t bindex, bend;
 	int dlgt, err;
 	struct kstatfs st;
-	u64 b, bavail;
+	unsigned long long b, bavail;
 	void *arg;
 	struct au_branch *br;
 	struct au_wbr_mfs *mfs;
@@ -504,7 +504,7 @@
 	struct dentry *parent, *h_parent;
 	aufs_bindex_t bindex, bstart, bend;
 	struct au_branch *br;
-	u64 b;
+	unsigned long long b;
 	struct inode *h_dir;
 
 	LKTRTrace("%.*s, %d\n", AuDLNPair(dentry), isdir);
diff -urNad aufs-0+20080719~/fs/aufs25/xino.c aufs-0+20080719/fs/aufs25/xino.c
--- aufs-0+20080719~/fs/aufs25/xino.c	2008-07-14 02:17:57.000000000 +0200
+++ aufs-0+20080719/fs/aufs25/xino.c	2008-08-16 18:53:57.000000000 +0200
@@ -231,7 +231,7 @@
 
 	pos = h_ino;
 	if (unlikely(Au_LOFF_MAX / sizeof(*xinoe) - 1 < pos)) {
-		AuIOErr1("too large hi%lu\n", h_ino);
+		AuIOErr1("too large hi%lu\n", (unsigned long)h_ino);
 		return -EFBIG;
 	}
 	pos *= sizeof(*xinoe);
@@ -256,7 +256,8 @@
 	struct au_branch *br;
 	unsigned int mnt_flags;
 
-	LKTRTrace("b%d, hi%lu, i%lu\n", bindex, h_ino, xinoe->ino);
+	LKTRTrace("b%d, hi%lu, i%lu\n",
+		  bindex, (unsigned long)h_ino, (unsigned long)xinoe->ino);
 	BUILD_BUG_ON(sizeof(long long) != sizeof(Au_LOFF_MAX)
 		     || ((loff_t)-1) > 0);
 
@@ -359,7 +360,8 @@
 		.ino	= 0
 	};
 
-	LKTRTrace("b%d, hi%lu, i%lu\n", bindex, h_ino, ino);
+	LKTRTrace("b%d, hi%lu, i%lu\n",
+		  bindex, (unsigned long)h_ino, (unsigned long)ino);
 
 	if (unlikely(!au_opt_test_xino(au_mntflags(sb))))
 		return 0;
@@ -435,7 +437,7 @@
 	pindex = sbinfo->si_xib_last_pindex;
 	mutex_unlock(&sbinfo->si_xib_mtx);
 	ino = xib_calc_ino(pindex, free_bit);
-	LKTRTrace("i%lu\n", ino);
+	LKTRTrace("i%lu\n", (unsigned long)ino);
 	return ino;
  out_err:
 	mutex_unlock(&sbinfo->si_xib_mtx);
@@ -457,7 +459,7 @@
 	ssize_t sz;
 	struct au_sbinfo *sbinfo;
 
-	LKTRTrace("b%d, hi%lu\n", bindex, h_ino);
+	LKTRTrace("b%d, hi%lu\n", bindex, (unsigned long)h_ino);
 
 	xinoe->ino = 0;
 	if (unlikely(!au_opt_test_xino(au_mntflags(sb))))
@@ -467,7 +469,7 @@
 	sbinfo = au_sbi(sb);
 	pos = h_ino;
 	if (unlikely(Au_LOFF_MAX / sizeof(*xinoe) - 1 < pos)) {
-		AuIOErr1("too large hi%lu\n", h_ino);
+		AuIOErr1("too large hi%lu\n", (unsigned long)h_ino);
 		return -EFBIG;
 	}
 	pos *= sizeof(*xinoe);