diff options
| author | Andy Whitcroft <apw@canonical.com> | 2012-02-16 20:08:20 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-08-15 23:46:20 -0600 |
| commit | 5b5164893ceaecb8a3dbf089494662104c98dc18 (patch) | |
| tree | 4c05bca4f809b46dd1eeca2a279fa5fee0e99f54 | |
| parent | c097a8f8296a2e3eec152e351f35970b0279b029 (diff) | |
UBUNTU: ubuntu: AUFS -- update to d266b0c5d0693d6383976ee54b9e2c0fa9a3f5b0
Andy Whitcroft (1):
UBUNTU: ubuntu: AUFS -- suppress benign plink warning messages
J. R. Okajima (10):
aufs: headers 1/2, bugfix, where the pr_fmt macro definition
aufs: headers 2/2, simply refined
aufs: tiny, update the year
aufs: update the donator
aufs stdalone: include path in Makefile
aufs: tiny, update the year
aufs: tiny, remove a duplicated header by accident
aufs: tiny, restore the removed header files for 2.6.38
make aufs-version 3.2
aufs3.2 20120109
Signed-off-by: Andy Whitcroft <apw@canonical.com>
67 files changed, 89 insertions, 153 deletions
diff --git a/ubuntu/aufs/BOM b/ubuntu/aufs/BOM index 04dc856855f..f549f2e3ea1 100644 --- a/ubuntu/aufs/BOM +++ b/ubuntu/aufs/BOM @@ -1,3 +1,3 @@ URL: git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git CHANGELOG: -COMMIT: 4cf5db36bcd9748e8e7270022f295f84d1fc2245 +COMMIT: d266b0c5d0693d6383976ee54b9e2c0fa9a3f5b0 diff --git a/ubuntu/aufs/Makefile b/ubuntu/aufs/Makefile index 46615fe113e..7e60943ffd4 100644 --- a/ubuntu/aufs/Makefile +++ b/ubuntu/aufs/Makefile @@ -8,8 +8,12 @@ endif # cf. include/linux/kernel.h # enable pr_debug ccflags-y += -DDEBUG -# sparse doesn't allow spaces -ccflags-y += -D'pr_fmt(fmt)=AUFS_NAME"\040%s:%d:%s[%d]:\040"fmt,__func__,__LINE__,current->comm,current->pid' +# sparse requires the full pathname +ifdef M +ccflags-y += -include ${M}/../../ubuntu/include/linux/aufs_type.h +else +ccflags-y += -include ${srctree}/ubuntu/include/linux/aufs_type.h +endif obj-$(CONFIG_AUFS_FS) += aufs.o aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \ diff --git a/ubuntu/aufs/aufs.h b/ubuntu/aufs/aufs.h index 3fd15c26ff4..33963a85a68 100644 --- a/ubuntu/aufs/aufs.h +++ b/ubuntu/aufs/aufs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/branch.c b/ubuntu/aufs/branch.c index dccc7409931..4cfe9e28e2a 100644 --- a/ubuntu/aufs/branch.c +++ b/ubuntu/aufs/branch.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ */ #include <linux/compat.h> -#include <linux/file.h> #include <linux/statfs.h> #include "aufs.h" diff --git a/ubuntu/aufs/branch.h b/ubuntu/aufs/branch.h index 1f39ad6c831..3870bc3f4bd 100644 --- a/ubuntu/aufs/branch.h +++ b/ubuntu/aufs/branch.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,9 +25,7 @@ #ifdef __KERNEL__ -#include <linux/fs.h> #include <linux/mount.h> -#include <linux/aufs_type.h> #include "dynop.h" #include "rwsem.h" #include "super.h" diff --git a/ubuntu/aufs/cpup.c b/ubuntu/aufs/cpup.c index 13fc3049067..7bf2672a9cb 100644 --- a/ubuntu/aufs/cpup.c +++ b/ubuntu/aufs/cpup.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,8 @@ * copy-up functions, see wbr_policy.c for copy-down */ -#include <linux/file.h> #include <linux/fs_stack.h> #include <linux/mm.h> -#include <linux/uaccess.h> #include "aufs.h" void au_cpup_attr_flags(struct inode *dst, struct inode *src) diff --git a/ubuntu/aufs/cpup.h b/ubuntu/aufs/cpup.h index 8e0aa591c62..2e4fbe079a2 100644 --- a/ubuntu/aufs/cpup.h +++ b/ubuntu/aufs/cpup.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,8 +26,6 @@ #ifdef __KERNEL__ #include <linux/path.h> -#include <linux/time.h> -#include <linux/aufs_type.h> struct inode; struct file; diff --git a/ubuntu/aufs/dbgaufs.c b/ubuntu/aufs/dbgaufs.c index 26d1d03ae0e..d1dbfd2655e 100644 --- a/ubuntu/aufs/dbgaufs.c +++ b/ubuntu/aufs/dbgaufs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/dbgaufs.h b/ubuntu/aufs/dbgaufs.h index 2eaa3f021bc..8fe49742e55 100644 --- a/ubuntu/aufs/dbgaufs.h +++ b/ubuntu/aufs/dbgaufs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,9 +25,6 @@ #ifdef __KERNEL__ -#include <linux/init.h> -#include <linux/aufs_type.h> - struct super_block; struct au_sbinfo; diff --git a/ubuntu/aufs/dcsub.c b/ubuntu/aufs/dcsub.c index 9d8cf10938f..5e8321eca3d 100644 --- a/ubuntu/aufs/dcsub.c +++ b/ubuntu/aufs/dcsub.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/dcsub.h b/ubuntu/aufs/dcsub.h index 1211304afe8..3d10731e276 100644 --- a/ubuntu/aufs/dcsub.h +++ b/ubuntu/aufs/dcsub.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,6 @@ #include <linux/dcache.h> #include <linux/fs.h> -#include <linux/types.h> struct dentry; diff --git a/ubuntu/aufs/debug.c b/ubuntu/aufs/debug.c index 040a4722a2a..9c9091d290a 100644 --- a/ubuntu/aufs/debug.c +++ b/ubuntu/aufs/debug.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ * debug print functions */ -#include <linux/module.h> #include <linux/vt_kern.h> #include "aufs.h" diff --git a/ubuntu/aufs/debug.h b/ubuntu/aufs/debug.h index 453459e664d..c4d5610a7f5 100644 --- a/ubuntu/aufs/debug.h +++ b/ubuntu/aufs/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,18 +26,9 @@ #ifdef __KERNEL__ #include <asm/system.h> -#include <linux/bug.h> -/* #include <linux/err.h> */ -#include <linux/init.h> #include <linux/module.h> #include <linux/kallsyms.h> -/* #include <linux/kernel.h> */ -#include <linux/delay.h> -/* #include <linux/kd.h> */ #include <linux/sysrq.h> -#include <linux/aufs_type.h> - -#include <asm/system.h> #ifdef CONFIG_AUFS_DEBUG #define AuDebugOn(a) BUG_ON(a) diff --git a/ubuntu/aufs/dentry.c b/ubuntu/aufs/dentry.c index 176fbdcd6ec..11ed8c25faf 100644 --- a/ubuntu/aufs/dentry.c +++ b/ubuntu/aufs/dentry.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/dentry.h b/ubuntu/aufs/dentry.h index 4f0827583c4..bbd9dc643ef 100644 --- a/ubuntu/aufs/dentry.h +++ b/ubuntu/aufs/dentry.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ #ifdef __KERNEL__ #include <linux/dcache.h> -#include <linux/aufs_type.h> #include "rwsem.h" struct au_hdentry { diff --git a/ubuntu/aufs/dinfo.c b/ubuntu/aufs/dinfo.c index a2a6809ca7c..24f22a91d21 100644 --- a/ubuntu/aufs/dinfo.c +++ b/ubuntu/aufs/dinfo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/dir.c b/ubuntu/aufs/dir.c index 2743616d97a..ec5a236b46d 100644 --- a/ubuntu/aufs/dir.c +++ b/ubuntu/aufs/dir.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ * directory operations */ -#include <linux/file.h> #include <linux/fs_stack.h> #include "aufs.h" diff --git a/ubuntu/aufs/dir.h b/ubuntu/aufs/dir.h index 2d0d8d2b151..dc52a6325c3 100644 --- a/ubuntu/aufs/dir.h +++ b/ubuntu/aufs/dir.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ #ifdef __KERNEL__ #include <linux/fs.h> -#include <linux/aufs_type.h> /* ---------------------------------------------------------------------- */ diff --git a/ubuntu/aufs/dynop.c b/ubuntu/aufs/dynop.c index 9b874c99c19..2aedc11fa07 100644 --- a/ubuntu/aufs/dynop.c +++ b/ubuntu/aufs/dynop.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Junjiro R. Okajima + * Copyright (C) 2010-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/dynop.h b/ubuntu/aufs/dynop.h index c3217d43315..029b08cff02 100644 --- a/ubuntu/aufs/dynop.h +++ b/ubuntu/aufs/dynop.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Junjiro R. Okajima + * Copyright (C) 2010-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,10 +25,6 @@ #ifdef __KERNEL__ -#include <linux/fs.h> -#include <linux/mm.h> -#include <linux/rcupdate.h> -#include <linux/aufs_type.h> #include "inode.h" enum {AuDy_AOP, AuDyLast}; diff --git a/ubuntu/aufs/export.c b/ubuntu/aufs/export.c index 05656fd1cf3..962d8e04f9e 100644 --- a/ubuntu/aufs/export.c +++ b/ubuntu/aufs/export.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ */ #include <linux/exportfs.h> -#include <linux/file.h> #include <linux/mnt_namespace.h> #include <linux/namei.h> #include <linux/nsproxy.h> diff --git a/ubuntu/aufs/f_op.c b/ubuntu/aufs/f_op.c index 43b5bca9188..942e71a7781 100644 --- a/ubuntu/aufs/f_op.c +++ b/ubuntu/aufs/f_op.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,8 @@ * file and vm operations */ -#include <linux/file.h> #include <linux/fs_stack.h> #include <linux/mman.h> -#include <linux/mm.h> #include <linux/security.h> #include "aufs.h" diff --git a/ubuntu/aufs/f_op_sp.c b/ubuntu/aufs/f_op_sp.c index 4f5cde800d4..48b8aa18af2 100644 --- a/ubuntu/aufs/f_op_sp.c +++ b/ubuntu/aufs/f_op_sp.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,6 @@ * their file I/O is handled out of aufs. */ -#include <linux/fs_stack.h> #include "aufs.h" static ssize_t aufs_aio_read_sp(struct kiocb *kio, const struct iovec *iov, diff --git a/ubuntu/aufs/file.c b/ubuntu/aufs/file.c index b798891953f..0b9aa487f01 100644 --- a/ubuntu/aufs/file.c +++ b/ubuntu/aufs/file.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,9 +20,6 @@ * handling file/dir, and address_space operation */ -#include <linux/file.h> -#include <linux/fsnotify.h> -#include <linux/namei.h> #include <linux/pagemap.h> #include "aufs.h" diff --git a/ubuntu/aufs/file.h b/ubuntu/aufs/file.h index 831dc5d252a..8bd6e3bab1a 100644 --- a/ubuntu/aufs/file.h +++ b/ubuntu/aufs/file.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,6 @@ #include <linux/file.h> #include <linux/fs.h> #include <linux/poll.h> -#include <linux/aufs_type.h> #include "rwsem.h" struct au_branch; diff --git a/ubuntu/aufs/finfo.c b/ubuntu/aufs/finfo.c index 3a8fa30d496..3208510c5ee 100644 --- a/ubuntu/aufs/finfo.c +++ b/ubuntu/aufs/finfo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ * file private data */ -#include <linux/file.h> #include "aufs.h" void au_hfput(struct au_hfile *hf, struct file *file) diff --git a/ubuntu/aufs/fstype.h b/ubuntu/aufs/fstype.h index 3bdbd143a82..a6b1037eeee 100644 --- a/ubuntu/aufs/fstype.h +++ b/ubuntu/aufs/fstype.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,6 @@ #include <linux/fs.h> #include <linux/magic.h> #include <linux/romfs_fs.h> -#include <linux/aufs_type.h> static inline int au_test_aufs(struct super_block *sb) { diff --git a/ubuntu/aufs/hfsnotify.c b/ubuntu/aufs/hfsnotify.c index deb0ab4a0ae..c48c315ac3e 100644 --- a/ubuntu/aufs/hfsnotify.c +++ b/ubuntu/aufs/hfsnotify.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/hfsplus.c b/ubuntu/aufs/hfsplus.c index 678b69c6968..9941f76083c 100644 --- a/ubuntu/aufs/hfsplus.c +++ b/ubuntu/aufs/hfsplus.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Junjiro R. Okajima + * Copyright (C) 2010-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ * and au_h_open_post() after releasing it. */ -#include <linux/file.h> #include "aufs.h" struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex) diff --git a/ubuntu/aufs/hnotify.c b/ubuntu/aufs/hnotify.c index 5ec653c1cf3..251588c4c8e 100644 --- a/ubuntu/aufs/hnotify.c +++ b/ubuntu/aufs/hnotify.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/i_op.c b/ubuntu/aufs/i_op.c index b99e7da0da6..fb0e646474e 100644 --- a/ubuntu/aufs/i_op.c +++ b/ubuntu/aufs/i_op.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,10 +22,8 @@ #include <linux/device_cgroup.h> #include <linux/fs_stack.h> -#include <linux/mm.h> #include <linux/namei.h> #include <linux/security.h> -#include <linux/uaccess.h> #include "aufs.h" static int h_permission(struct inode *h_inode, int mask, diff --git a/ubuntu/aufs/i_op_add.c b/ubuntu/aufs/i_op_add.c index d1aef9386ad..c5255c6a7b9 100644 --- a/ubuntu/aufs/i_op_add.c +++ b/ubuntu/aufs/i_op_add.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/i_op_del.c b/ubuntu/aufs/i_op_del.c index 309d936f743..e69c151ce75 100644 --- a/ubuntu/aufs/i_op_del.c +++ b/ubuntu/aufs/i_op_del.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/i_op_ren.c b/ubuntu/aufs/i_op_ren.c index e8025baa97f..f253bec7efa 100644 --- a/ubuntu/aufs/i_op_ren.c +++ b/ubuntu/aufs/i_op_ren.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/iinfo.c b/ubuntu/aufs/iinfo.c index cd1086eb459..d9571c47609 100644 --- a/ubuntu/aufs/iinfo.c +++ b/ubuntu/aufs/iinfo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/inode.c b/ubuntu/aufs/inode.c index 00ae8877b7d..df70edee95c 100644 --- a/ubuntu/aufs/inode.c +++ b/ubuntu/aufs/inode.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/inode.h b/ubuntu/aufs/inode.h index 0c500474c96..1fe58f63253 100644 --- a/ubuntu/aufs/inode.h +++ b/ubuntu/aufs/inode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,9 +25,7 @@ #ifdef __KERNEL__ -#include <linux/fs.h> #include <linux/fsnotify.h> -#include <linux/aufs_type.h> #include "rwsem.h" struct vfsmount; diff --git a/ubuntu/aufs/ioctl.c b/ubuntu/aufs/ioctl.c index 93151b350ee..30a49dff821 100644 --- a/ubuntu/aufs/ioctl.c +++ b/ubuntu/aufs/ioctl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,6 @@ * assist the pathconf(3) wrapper library. */ -#include <linux/file.h> #include "aufs.h" static int au_wbr_fd(struct path *path, struct aufs_wbr_fd __user *arg) diff --git a/ubuntu/aufs/loop.c b/ubuntu/aufs/loop.c index 4998192e6f1..317f0e46de3 100644 --- a/ubuntu/aufs/loop.c +++ b/ubuntu/aufs/loop.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/loop.h b/ubuntu/aufs/loop.h index fc156e80453..b7af6a73cad 100644 --- a/ubuntu/aufs/loop.h +++ b/ubuntu/aufs/loop.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/module.c b/ubuntu/aufs/module.c index 175f0347577..ef288b86724 100644 --- a/ubuntu/aufs/module.c +++ b/ubuntu/aufs/module.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/module.h b/ubuntu/aufs/module.h index e61fa54768d..242f4ea3e99 100644 --- a/ubuntu/aufs/module.h +++ b/ubuntu/aufs/module.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/opts.c b/ubuntu/aufs/opts.c index 4e868a6de6c..35c18ef307e 100644 --- a/ubuntu/aufs/opts.c +++ b/ubuntu/aufs/opts.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,6 @@ * mount options/flags */ -#include <linux/file.h> -#include <linux/jiffies.h> #include <linux/namei.h> #include <linux/types.h> /* a distribution requires */ #include <linux/parser.h> diff --git a/ubuntu/aufs/opts.h b/ubuntu/aufs/opts.h index 1ef371020d6..958f5119b01 100644 --- a/ubuntu/aufs/opts.h +++ b/ubuntu/aufs/opts.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ #ifdef __KERNEL__ #include <linux/path.h> -#include <linux/aufs_type.h> struct file; struct super_block; diff --git a/ubuntu/aufs/plink.c b/ubuntu/aufs/plink.c index 1824e6df635..6338461902b 100644 --- a/ubuntu/aufs/plink.c +++ b/ubuntu/aufs/plink.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/poll.c b/ubuntu/aufs/poll.c index 873f3bb5e6b..59d1a4b285e 100644 --- a/ubuntu/aufs/poll.c +++ b/ubuntu/aufs/poll.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/procfs.c b/ubuntu/aufs/procfs.c index 25463319bad..8169782d5e3 100644 --- a/ubuntu/aufs/procfs.c +++ b/ubuntu/aufs/procfs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Junjiro R. Okajima + * Copyright (C) 2010-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/rdu.c b/ubuntu/aufs/rdu.c index 4e0756dc312..76565037940 100644 --- a/ubuntu/aufs/rdu.c +++ b/ubuntu/aufs/rdu.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,8 +23,6 @@ #include <linux/compat.h> #include <linux/fs_stack.h> #include <linux/security.h> -#include <linux/uaccess.h> -#include <linux/aufs_type.h> #include "aufs.h" /* bits for struct aufs_rdu.flags */ diff --git a/ubuntu/aufs/rwsem.h b/ubuntu/aufs/rwsem.h index dcd1def9eed..d6c1b376730 100644 --- a/ubuntu/aufs/rwsem.h +++ b/ubuntu/aufs/rwsem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ #ifdef __KERNEL__ -#include <linux/rwsem.h> #include "debug.h" struct au_rwsem { diff --git a/ubuntu/aufs/sbinfo.c b/ubuntu/aufs/sbinfo.c index d9141f8cc48..2448efe0801 100644 --- a/ubuntu/aufs/sbinfo.c +++ b/ubuntu/aufs/sbinfo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ * superblock private data */ -#include <linux/jiffies.h> #include "aufs.h" /* diff --git a/ubuntu/aufs/spl.h b/ubuntu/aufs/spl.h index 37a032907a3..743a3076207 100644 --- a/ubuntu/aufs/spl.h +++ b/ubuntu/aufs/spl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,10 +25,6 @@ #ifdef __KERNEL__ -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/rculist.h> - struct au_splhead { spinlock_t spin; struct list_head head; diff --git a/ubuntu/aufs/super.c b/ubuntu/aufs/super.c index 595282e8700..c798792b74e 100644 --- a/ubuntu/aufs/super.c +++ b/ubuntu/aufs/super.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,7 @@ * mount and super_block operations */ -#include <linux/buffer_head.h> -#include <linux/jiffies.h> +#include <linux/mm.h> #include <linux/module.h> #include <linux/seq_file.h> #include <linux/statfs.h> diff --git a/ubuntu/aufs/super.h b/ubuntu/aufs/super.h index f490b4af4c8..9967dee0a50 100644 --- a/ubuntu/aufs/super.h +++ b/ubuntu/aufs/super.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ #ifdef __KERNEL__ #include <linux/fs.h> -#include <linux/aufs_type.h> #include "rwsem.h" #include "spl.h" #include "wkq.h" diff --git a/ubuntu/aufs/sysaufs.c b/ubuntu/aufs/sysaufs.c index ab4036e18a6..a675324ca6f 100644 --- a/ubuntu/aufs/sysaufs.c +++ b/ubuntu/aufs/sysaufs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,9 +21,7 @@ * they are necessary regardless sysfs is disabled. */ -#include <linux/fs.h> #include <linux/random.h> -#include <linux/sysfs.h> #include "aufs.h" unsigned long sysaufs_si_mask; diff --git a/ubuntu/aufs/sysaufs.h b/ubuntu/aufs/sysaufs.h index 5b6b8d0c5a8..5aaff3bb608 100644 --- a/ubuntu/aufs/sysaufs.h +++ b/ubuntu/aufs/sysaufs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ #ifdef __KERNEL__ #include <linux/sysfs.h> -#include <linux/aufs_type.h> #include "module.h" struct super_block; diff --git a/ubuntu/aufs/sysfs.c b/ubuntu/aufs/sysfs.c index 215cd6e5a2f..f72519dac36 100644 --- a/ubuntu/aufs/sysfs.c +++ b/ubuntu/aufs/sysfs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,7 @@ * sysfs interface */ -#include <linux/fs.h> -#include <linux/module.h> #include <linux/seq_file.h> -#include <linux/sysfs.h> #include "aufs.h" #ifdef CONFIG_AUFS_FS_MODULE diff --git a/ubuntu/aufs/sysrq.c b/ubuntu/aufs/sysrq.c index 59d3b521b22..c481d2b6dd5 100644 --- a/ubuntu/aufs/sysrq.c +++ b/ubuntu/aufs/sysrq.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,9 +20,6 @@ * magic sysrq hanlder */ -#include <linux/fs.h> -#include <linux/module.h> -#include <linux/moduleparam.h> /* #include <linux/sysrq.h> */ #include <linux/writeback.h> #include "aufs.h" diff --git a/ubuntu/aufs/vdir.c b/ubuntu/aufs/vdir.c index 5e423768665..3f16d515377 100644 --- a/ubuntu/aufs/vdir.c +++ b/ubuntu/aufs/vdir.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ * virtual or vertical directory */ -#include <linux/hash.h> #include "aufs.h" static unsigned int calc_size(int nlen) diff --git a/ubuntu/aufs/vfsub.c b/ubuntu/aufs/vfsub.c index 301e34c5010..331ab17fb5c 100644 --- a/ubuntu/aufs/vfsub.c +++ b/ubuntu/aufs/vfsub.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,12 +20,10 @@ * sub-routines for VFS */ -#include <linux/file.h> #include <linux/ima.h> #include <linux/namei.h> #include <linux/security.h> #include <linux/splice.h> -#include <linux/uaccess.h> #include "aufs.h" int vfsub_update_h_iattr(struct path *h_path, int *did) diff --git a/ubuntu/aufs/vfsub.h b/ubuntu/aufs/vfsub.h index fe0751811bb..ce4d5b683eb 100644 --- a/ubuntu/aufs/vfsub.h +++ b/ubuntu/aufs/vfsub.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/wbr_policy.c b/ubuntu/aufs/wbr_policy.c index dec340a4ef0..2bf2efaa33b 100644 --- a/ubuntu/aufs/wbr_policy.c +++ b/ubuntu/aufs/wbr_policy.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/whout.c b/ubuntu/aufs/whout.c index de3a9f5bee2..676486362d5 100644 --- a/ubuntu/aufs/whout.c +++ b/ubuntu/aufs/whout.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ * whiteout for logical deletion and opaque directory */ -#include <linux/fs.h> #include "aufs.h" #define WH_MASK S_IRUGO diff --git a/ubuntu/aufs/whout.h b/ubuntu/aufs/whout.h index 11137f40049..f7c45f0998f 100644 --- a/ubuntu/aufs/whout.h +++ b/ubuntu/aufs/whout.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ #ifdef __KERNEL__ -#include <linux/aufs_type.h> #include "dir.h" /* whout.c */ diff --git a/ubuntu/aufs/wkq.c b/ubuntu/aufs/wkq.c index d75808a1a7e..91c739f476f 100644 --- a/ubuntu/aufs/wkq.c +++ b/ubuntu/aufs/wkq.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ubuntu/aufs/wkq.h b/ubuntu/aufs/wkq.h index c6352aeeac8..0e44f73c2a0 100644 --- a/ubuntu/aufs/wkq.h +++ b/ubuntu/aufs/wkq.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,10 +26,6 @@ #ifdef __KERNEL__ -#include <linux/sched.h> -#include <linux/wait.h> -#include <linux/aufs_type.h> - struct super_block; /* ---------------------------------------------------------------------- */ diff --git a/ubuntu/aufs/xino.c b/ubuntu/aufs/xino.c index 835fe5ca81f..2285299293e 100644 --- a/ubuntu/aufs/xino.c +++ b/ubuntu/aufs/xino.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,9 +20,7 @@ * external inode number translation table and bitmap */ -#include <linux/file.h> #include <linux/seq_file.h> -#include <linux/uaccess.h> #include "aufs.h" /* todo: unnecessary to support mmap_sem since kernel-space? */ diff --git a/ubuntu/include/linux/aufs_type.h b/ubuntu/include/linux/aufs_type.h index 6738afb001f..2f2fbcdbcce 100644 --- a/ubuntu/include/linux/aufs_type.h +++ b/ubuntu/include/linux/aufs_type.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2012 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,17 +19,27 @@ #ifndef __AUFS_TYPE_H__ #define __AUFS_TYPE_H__ -#include <linux/ioctl.h> -#include <linux/kernel.h> -#include <linux/limits.h> +#define AUFS_NAME "aufs" + #ifdef __KERNEL__ -#include <linux/types.h> +/* + * define it before including all other headers. + * sched.h may use pr_* macros before defining "current", so define the + * no-current version first, and re-define later. + */ +#define pr_fmt(fmt) AUFS_NAME " %s:%d: " fmt, __func__, __LINE__ +#include <linux/sched.h> +#undef pr_fmt +#define pr_fmt(fmt) AUFS_NAME " %s:%d:%s[%d]: " fmt, \ + __func__, __LINE__, current->comm, current->pid #else #include <stdint.h> #include <sys/types.h> -#endif +#endif /* __KERNEL__ */ + +#include <linux/limits.h> -#define AUFS_VERSION "3.x-rcN-20111205" +#define AUFS_VERSION "3.2-20120109" /* todo? move this to linux-2.6.19/include/magic.h */ #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') @@ -58,7 +68,6 @@ typedef int16_t aufs_bindex_t; /* ---------------------------------------------------------------------- */ -#define AUFS_NAME "aufs" #define AUFS_FSTYPE AUFS_NAME #define AUFS_ROOT_INO 2 |