-aufs4.3 kbuild patch
+aufs4.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index da3f32f..b9879fe 100644
+index 6ce72d8..4aa31ea 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -215,6 +215,7 @@ source "fs/pstore/Kconfig"
+@@ -221,6 +221,7 @@ source "fs/pstore/Kconfig"
source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index f79cf40..7562a4d 100644
+index 79f5225..a7c7f16 100644
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -125,3 +125,4 @@ obj-y += exofs/ # Multiple modules
+@@ -126,3 +126,4 @@ obj-y += exofs/ # Multiple modules
obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/
obj-$(CONFIG_EFIVAR_FS) += efivarfs/
+obj-$(CONFIG_AUFS_FS) += aufs/
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
-index f7b2db4..47098aed 100644
+index c2e5d6c..d736c11 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -59,6 +59,7 @@ header-y += atmsvc.h
header-y += auto_fs4.h
header-y += auto_fs.h
header-y += auxvec.h
-aufs4.3 base patch
+aufs4.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index 747c653..53ecc33 100644
+index 233f834..c250892 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1985,6 +1985,19 @@ F: include/linux/audit.h
+@@ -2029,6 +2029,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
W: http://miguelojeda.es/auxdisplay.htm
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 674f800a..291ec9e 100644
+index 423f4ca..abfdd2b 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -560,6 +560,24 @@ static inline int is_loop_device(struct file *file)
+@@ -706,6 +706,24 @@ static inline int is_loop_device(struct file *file)
return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
}
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
-index 5fc1e50..5f8385a 100644
+index 4cf700d..30a091d 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1102,8 +1102,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1110,8 +1110,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/*
* Attempt to initiate a splice from pipe to file.
*/
{
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
loff_t *, size_t, unsigned int);
-@@ -1119,9 +1119,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1127,9 +1127,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
/*
* Attempt to initiate a splice from a file to a pipe.
*/
static inline void fput_light(struct file *file, int fput_needed)
{
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 72d8a84..fabd9d7a 100644
+index 3aa5142..8d48506 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1687,6 +1687,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1672,6 +1672,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags);
#endif
-aufs4.3 mmap patch
+aufs4.x-rcN mmap patch
-diff --git a/fs/buffer.c b/fs/buffer.c
-index 82283ab..477e5f3 100644
---- a/fs/buffer.c
-+++ b/fs/buffer.c
-@@ -2473,7 +2473,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
- * Update file times before taking page lock. We may end up failing the
- * fault so this update may be superfluous but who really cares...
- */
-- file_update_time(vma->vm_file);
-+ vma_file_update_time(vma);
-
- ret = __block_page_mkwrite(vma, vmf, get_block);
- sb_end_pagefault(sb);
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index b25eee4..c83d588 100644
+index 4bd5d31..aa41f2a 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
-@@ -1914,7 +1914,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -1921,7 +1921,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path)
down_read(&mm->mmap_sem);
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index e2d46ad..5e7e631 100644
+index 187b3b5..e03793e 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
-@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -281,7 +281,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
const char *name = NULL;
if (file) {
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1465,7 +1468,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1505,7 +1508,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 80001de..9248b97 100644
+index 00bad77..cc616b0 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1211,6 +1211,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1183,6 +1183,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
}
#endif
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
void *buf, int len, int write);
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 3d6baa7..750ca95 100644
+index f8d1492..c3a3760 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -250,6 +250,7 @@ struct vm_region {
+@@ -272,6 +272,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -324,6 +325,7 @@ struct vm_area_struct {
+@@ -346,6 +347,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units, *not* PAGE_CACHE_SIZE */
struct file * vm_file; /* File we map to (can be NULL). */
#ifndef CONFIG_MMU
diff --git a/kernel/fork.c b/kernel/fork.c
-index 2845623..71004bd 100644
+index fce002e..2230a0f 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -462,7 +462,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -464,7 +464,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping;
obj-y += init-mm.o
diff --git a/mm/filemap.c b/mm/filemap.c
-index 327910c..7bbc372 100644
+index 1bb0076..8eaece8 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -2089,7 +2089,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -2128,7 +2128,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
int ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
if (page->mapping != inode->i_mapping) {
unlock_page(page);
diff --git a/mm/memory.c b/mm/memory.c
-index deb679c..df2ce3e 100644
+index c387430..d434404 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2035,7 +2035,7 @@ static inline int wp_page_reuse(struct mm_struct *mm,
return VM_FAULT_WRITE;
diff --git a/mm/mmap.c b/mm/mmap.c
-index 79bcc9f..da28c8a 100644
+index 2ce04a6..f555c0a 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -275,7 +275,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
}
if (next->anon_vma)
anon_vma_merge(vma, next);
-@@ -1683,8 +1683,8 @@ out:
+@@ -1681,8 +1681,8 @@ out:
return addr;
unmap_and_free_vma:
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2485,7 +2485,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2488,7 +2488,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
-@@ -2504,7 +2504,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2507,7 +2507,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new);
if (new->vm_file)
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
-@@ -2646,7 +2646,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2649,7 +2649,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma;
unsigned long populate = 0;
unsigned long ret = -EINVAL;
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. "
"See Documentation/vm/remap_file_pages.txt.\n",
-@@ -2690,10 +2689,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2693,10 +2692,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
munlock_vma_pages_range(vma, start, start + size);
}
out:
up_write(&mm->mmap_sem);
if (populate)
-@@ -2963,7 +2962,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2966,7 +2965,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c
-index ab14a20..fffc566 100644
+index 92be862..29179f7 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -671,7 +671,7 @@ static void __put_nommu_region(struct vm_region *region)
+ fput(pr);
+}
+#endif /* !CONFIG_MMU */
-aufs4.3 standalone patch
+aufs4.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
index 8aa7f26..f997345 100644
ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
{
diff --git a/fs/splice.c b/fs/splice.c
-index 5f8385a..f76067e 100644
+index 30a091d..c37c311 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1115,6 +1115,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1123,6 +1123,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
return splice_write(pipe, out, ppos, len, flags);
}
/*
* Attempt to initiate a splice from a file to a pipe.
-@@ -1141,6 +1142,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1149,6 +1150,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags);
}
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/fs/xattr.c b/fs/xattr.c
-index 072fee1..a7677af 100644
+index 9b932b9..44c457a 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -207,6 +207,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
{
diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/ABI/testing/debugfs-aufs 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,50 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/ABI/testing/sysfs-aufs 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,170 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+about it. But currently I have implemented it in kernel space.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,258 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+For this purpose, use "aumvdown" command in aufs-util.git.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt linux/Documentation/filesystems/aufs/design/03atomic_open.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,85 @@
+
+# Copyright (C) 2015 Junjiro R. Okajima
+ be implemented in aufs, but not all I am afraid.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,113 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+ by over-mounting something (or another method).
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,74 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+ same named entry on the upper branch.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,64 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+ copyup policy.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linux/Documentation/filesystems/aufs/design/06fhsm.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,120 @@
+
+# Copyright (C) 2011-2015 Junjiro R. Okajima
+should restore the original file state after an error happens.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,72 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+I have to give up this "looks-smater" approach.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt linux/Documentation/filesystems/aufs/design/06xattr.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2015-09-24 10:47:58.244719488 +0200
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,96 @@
+
+# Copyright (C) 2014-2015 Junjiro R. Okajima
+now, aufs implements the branch attributes to ignore the error.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt 2015-09-24 10:47:58.248052907 +0200
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,58 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2015-09-24 10:47:58.248052907 +0200
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,52 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+initramfs will use it to replace the old one at the next boot.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2015-09-24 10:47:58.248052907 +0200
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2016-01-13 20:11:11.663093444 +0100
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2015 Junjiro R. Okajima
+regular files only.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
--- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README 2015-09-24 10:47:58.244719488 +0200
-@@ -0,0 +1,383 @@
++++ linux/Documentation/filesystems/aufs/README 2016-01-13 20:11:11.663093444 +0100
+@@ -0,0 +1,390 @@
+
+Aufs4 -- advanced multi layered unification filesystem version 4.x
+http://aufs.sf.net
+And you cannot select CONFIG_AUFS_FS=m for this version, eg. you cannot
+build aufs4 as an external kernel module.
+Several extra patches are not included in this tree. Only
-+aufs4-standalone tree contains them. They are describe in the later
++aufs4-standalone tree contains them. They are described in the later
+section "Configuration and Compilation."
+
+On the other hand, the aufs4-standalone tree has only aufs source files
+ duplication of inode number, which is important for backup tools and
+ other utilities. When you find aufs XINO files for tmpfs branch
+ growing too much, try this patch.
++- lockdep-debug.patch
++ Because aufs is not only an ordinary filesystem (callee of VFS), but
++ also a caller of VFS functions for branch filesystems, subclassing of
++ the internal locks for LOCKDEP is necessary. LOCKDEP is a debugging
++ feature of linux kernel. If you enable CONFIG_LOCKDEP, then you will
++ need to apply this debug patch to expand several constant values.
++ If don't know what LOCKDEP, then you don't have apply this patch.
+
+
+4. Usage
+# End: ;
diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
--- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h 2015-09-24 10:47:58.248052907 +0200
++++ linux/fs/aufs/aufs.h 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
--- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c 2015-11-11 17:21:46.915530388 +0100
-@@ -0,0 +1,1413 @@
++++ linux/fs/aufs/branch.c 2016-01-13 20:11:11.666426853 +0100
+@@ -0,0 +1,1407 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+
+ err = -ENOMEM;
+ root = sb->s_root;
-+ add_branch = kmalloc(sizeof(*add_branch), GFP_NOFS);
++ add_branch = kzalloc(sizeof(*add_branch), GFP_NOFS);
+ if (unlikely(!add_branch))
+ goto out;
+
+ if (unlikely(err))
+ goto out_br;
+
-+ add_branch->br_wbr = NULL;
+ if (au_br_writable(perm)) {
+ /* may be freed separately at changing the branch permission */
-+ add_branch->br_wbr = kmalloc(sizeof(*add_branch->br_wbr),
++ add_branch->br_wbr = kzalloc(sizeof(*add_branch->br_wbr),
+ GFP_NOFS);
+ if (unlikely(!add_branch->br_wbr))
+ goto out_hnotify;
+ }
+
-+ add_branch->br_fhsm = NULL;
+ if (au_br_fhsm(perm)) {
+ err = au_fhsm_br_alloc(add_branch);
+ if (unlikely(err))
+
+ wbr = br->br_wbr;
+ au_rw_init(&wbr->wbr_wh_rwsem);
-+ memset(wbr->wbr_wh, 0, sizeof(wbr->wbr_wh));
+ atomic_set(&wbr->wbr_wh_running, 0);
-+ wbr->wbr_bytes = 0;
+
+ /*
+ * a limit for rmdir/rename a dir
+ struct inode *h_inode;
+
+ err = 0;
-+ memset(&br->br_xino, 0, sizeof(br->br_xino));
+ mutex_init(&br->br_xino.xi_nondir_mtx);
+ br->br_perm = add->perm;
+ br->br_path = add->path; /* set first, path_get() later */
+ spin_lock_init(&br->br_dykey_lock);
-+ memset(br->br_dykey, 0, sizeof(br->br_dykey));
+ atomic_set(&br->br_count, 0);
+ atomic_set(&br->br_xino_running, 0);
+ br->br_id = au_new_br_id(sb);
+ for (ull = 0; ull < max; ull++)
+ if (a[ull])
+ fput(a[ull]);
-+ au_array_free(a);
++ kvfree(a);
+}
+
+/* ---------------------------------------------------------------------- */
+
+ if (unlikely(err)) {
+ rerr = -ENOMEM;
-+ br->br_wbr = kmalloc(sizeof(*br->br_wbr),
++ br->br_wbr = kzalloc(sizeof(*br->br_wbr),
+ GFP_NOFS);
+ if (br->br_wbr)
+ rerr = au_wbr_init(br, sb, br->br_perm);
+ } else if (au_br_writable(mod->perm)) {
+ /* ro --> rw */
+ err = -ENOMEM;
-+ br->br_wbr = kmalloc(sizeof(*br->br_wbr), GFP_NOFS);
++ br->br_wbr = kzalloc(sizeof(*br->br_wbr), GFP_NOFS);
+ if (br->br_wbr) {
+ err = au_wbr_init(br, sb, mod->perm);
+ if (unlikely(err)) {
+}
diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
--- /usr/share/empty/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h 2015-11-11 17:21:46.915530388 +0100
++++ linux/fs/aufs/branch.h 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_BRANCH_H__ */
diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
--- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk 2015-09-24 10:47:58.248052907 +0200
++++ linux/fs/aufs/conf.mk 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,38 @@
+
+AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2015-11-11 17:21:46.915530388 +0100
++++ linux/fs/aufs/cpup.c 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,1319 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
--- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h 2015-09-24 10:47:58.248052907 +0200
++++ linux/fs/aufs/cpup.h 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_CPUP_H__ */
diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
--- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2015-09-24 10:47:58.248052907 +0200
++++ linux/fs/aufs/dbgaufs.c 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
--- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h 2015-09-24 10:47:58.248052907 +0200
++++ linux/fs/aufs/dbgaufs.h 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __DBGAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
--- /usr/share/empty/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c 2015-09-24 10:47:58.248052907 +0200
++++ linux/fs/aufs/dcsub.c 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
--- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/dcsub.h 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_DCSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
--- /usr/share/empty/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c 2015-09-24 10:47:58.251386326 +0200
-@@ -0,0 +1,440 @@
++++ linux/fs/aufs/debug.c 2016-01-13 20:11:11.666426853 +0100
+@@ -0,0 +1,438 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ }
+
+ a->mnt.mnt_sb = sb;
-+ a->fake.br_perm = 0;
+ a->fake.br_path.mnt = &a->mnt;
-+ a->fake.br_xino.xi_file = NULL;
+ atomic_set(&a->fake.br_count, 0);
+ smp_mb(); /* atomic_set */
+ err = do_pri_br(-1, &a->fake);
+}
diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
--- /usr/share/empty/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.h 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/debug.h 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_DEBUG_H__ */
diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
--- /usr/share/empty/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c 2015-11-11 17:21:46.918863802 +0100
++++ linux/fs/aufs/dentry.c 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,1136 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ struct dentry *dentry;
+ struct inode *inode;
+ mode_t mode;
-+ } orig_h, tmp_h;
++ } orig_h, tmp_h = {
++ .dentry = NULL
++ };
+ struct au_hdentry *hd;
+ struct inode *inode, *h_inode;
+ struct dentry *h_dentry;
+ orig_h.inode = d_inode(orig_h.dentry);
+ orig_h.mode = orig_h.inode->i_mode & S_IFMT;
+ }
-+ memset(&tmp_h, 0, sizeof(tmp_h));
+ if (tmp->di_bstart >= 0) {
+ tmp_h.dentry = tmp->di_hdentry[tmp->di_bstart].hd_dentry;
-+ tmp_h.inode = NULL;
+ if (d_is_positive(tmp_h.dentry)) {
+ tmp_h.inode = d_inode(tmp_h.dentry);
+ tmp_h.mode = tmp_h.inode->i_mode & S_IFMT;
+};
diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
--- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h 2015-11-11 17:21:46.918863802 +0100
++++ linux/fs/aufs/dentry.h 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_DENTRY_H__ */
diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
--- /usr/share/empty/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/dinfo.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,550 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
--- /usr/share/empty/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c 2015-12-10 17:59:16.836166410 +0100
++++ linux/fs/aufs/dir.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,753 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+};
diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
--- /usr/share/empty/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/dir.h 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_DIR_H__ */
diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
--- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/dynop.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2010-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
--- /usr/share/empty/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.h 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/dynop.h 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2010-2015 Junjiro R. Okajima
+#endif /* __AUFS_DYNOP_H__ */
diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
--- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/export.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,832 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
--- /usr/share/empty/fs/aufs/fhsm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fhsm.c 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/fhsm.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,426 @@
+/*
+ * Copyright (C) 2011-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
--- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c 2015-11-11 17:21:46.918863802 +0100
++++ linux/fs/aufs/file.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,844 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+};
diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
--- /usr/share/empty/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.h 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/file.h 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_FILE_H__ */
diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
--- /usr/share/empty/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c 2015-09-24 10:47:58.251386326 +0200
-@@ -0,0 +1,157 @@
++++ linux/fs/aufs/finfo.c 2016-01-13 20:11:11.669760262 +0100
+@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ if (fidir) {
+ fidir->fd_bbot = -1;
+ fidir->fd_nent = nbr;
-+ fidir->fd_vdir_cache = NULL;
+ }
+
+ return fidir;
+}
diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
--- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c 2015-09-24 10:47:58.251386326 +0200
++++ linux/fs/aufs/f_op.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,738 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+};
diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
--- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h 2015-12-10 17:59:16.836166410 +0100
++++ linux/fs/aufs/fstype.h 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,400 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_FSTYPE_H__ */
diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
--- /usr/share/empty/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsnotify.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/hfsnotify.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+};
diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
--- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/hfsplus.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
--- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/hnotify.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,710 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
--- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/iinfo.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,277 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ sigen = au_sigen(inode->i_sb);
+ iinfo = au_ii(inode);
+ iigen = &iinfo->ii_generation;
-+ spin_lock(&iinfo->ii_genspin);
++ spin_lock(&iigen->ig_spin);
+ iigen->ig_generation = sigen;
+ if (half)
+ au_ig_fset(iigen->ig_flags, HALF_REFRESHED);
+ else
+ au_ig_fclr(iigen->ig_flags, HALF_REFRESHED);
-+ spin_unlock(&iinfo->ii_genspin);
++ spin_unlock(&iigen->ig_spin);
+}
+
+/* it may be called at remount time, too */
+ struct au_iinfo *iinfo = &c->iinfo;
+ static struct lock_class_key aufs_ii;
+
-+ spin_lock_init(&iinfo->ii_genspin);
++ spin_lock_init(&iinfo->ii_generation.ig_spin);
+ au_rw_init(&iinfo->ii_rwsem);
+ au_rw_class(&iinfo->ii_rwsem, &aufs_ii);
+ inode_init_once(&c->vfs_inode);
+}
diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
--- /usr/share/empty/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c 2015-12-10 17:59:16.836166410 +0100
++++ linux/fs/aufs/inode.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,528 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2015-12-10 17:59:16.836166410 +0100
-@@ -0,0 +1,681 @@
++++ linux/fs/aufs/inode.h 2016-01-13 20:11:11.669760262 +0100
+@@ -0,0 +1,685 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ do { (flags) &= ~AuIG_##name; } while (0)
+
+struct au_iigen {
++ spinlock_t ig_spin;
+ __u32 ig_generation, ig_flags;
+};
+
+struct au_vdir;
+struct au_iinfo {
-+ spinlock_t ii_genspin;
+ struct au_iigen ii_generation;
+ struct super_block *ii_hsb1; /* no get/put */
+
+#endif
+}
+
-+static inline unsigned int au_iigen(struct inode *inode, struct au_iigen *iigen)
++static inline unsigned int au_iigen(struct inode *inode, struct au_iigen *iigen_arg)
+{
+ unsigned int gen;
+ struct au_iinfo *iinfo;
++ struct au_iigen *iigen;
+
+ iinfo = au_ii(inode);
-+ spin_lock(&iinfo->ii_genspin);
-+ if (iigen)
-+ *iigen = iinfo->ii_generation;
-+ gen = iinfo->ii_generation.ig_generation;
-+ spin_unlock(&iinfo->ii_genspin);
++ iigen = &iinfo->ii_generation;
++ spin_lock(&iigen->ig_spin);
++ if (iigen_arg)
++ *iigen_arg = *iigen;
++ gen = iigen->ig_generation;
++ spin_unlock(&iigen->ig_spin);
+
+ return gen;
+}
+static inline void au_iigen_dec(struct inode *inode)
+{
+ struct au_iinfo *iinfo;
++ struct au_iigen *iigen;
+
+ iinfo = au_ii(inode);
-+ spin_lock(&iinfo->ii_genspin);
-+ iinfo->ii_generation.ig_generation--;
-+ spin_unlock(&iinfo->ii_genspin);
++ iigen = &iinfo->ii_generation;
++ spin_lock(&iigen->ig_spin);
++ iigen->ig_generation--;
++ spin_unlock(&iigen->ig_spin);
+}
+
+static inline int au_iigen_test(struct inode *inode, unsigned int sigen)
+#endif /* __AUFS_INODE_H__ */
diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
--- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/ioctl.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif
diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
--- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/i_op_add.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,932 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2015-12-10 17:59:16.836166410 +0100
++++ linux/fs/aufs/i_op.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,1484 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+};
diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
--- /usr/share/empty/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_del.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/i_op_del.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,510 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
--- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c 2015-12-10 17:59:16.836166410 +0100
++++ linux/fs/aufs/i_op_ren.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,1015 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
--- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig 2015-09-24 10:47:58.248052907 +0200
++++ linux/fs/aufs/Kconfig 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,185 @@
+config AUFS_FS
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
+endif
diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
--- /usr/share/empty/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c 2015-11-11 17:21:46.918863802 +0100
++++ linux/fs/aufs/loop.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
--- /usr/share/empty/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/loop.h 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_LOOP_H__ */
diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
--- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/magic.mk 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/magic.mk 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,30 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
+endif
diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
--- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile 2015-09-24 10:47:58.248052907 +0200
++++ linux/fs/aufs/Makefile 2016-01-13 20:11:11.666426853 +0100
@@ -0,0 +1,44 @@
+
+include ${src}/magic.mk
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
--- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c 2015-12-10 17:59:16.839499823 +0100
++++ linux/fs/aufs/module.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+module_exit(aufs_exit);
diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
--- /usr/share/empty/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/module.h 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_MODULE_H__ */
diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
--- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2015-12-10 17:59:16.839499823 +0100
++++ linux/fs/aufs/mvdown.c 2016-01-13 20:11:11.669760262 +0100
@@ -0,0 +1,703 @@
+/*
+ * Copyright (C) 2011-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
--- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c 2015-12-10 17:59:16.839499823 +0100
++++ linux/fs/aufs/opts.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,1859 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
--- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h 2015-12-10 17:59:16.839499823 +0100
++++ linux/fs/aufs/opts.h 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_OPTS_H__ */
diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
--- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/plink.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,528 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
--- /usr/share/empty/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/poll.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/poll.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
--- /usr/share/empty/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/posix_acl.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/posix_acl.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2014-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
--- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/procfs.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2010-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
--- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/rdu.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,388 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif
diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
--- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/rwsem.h 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_RWSEM_H__ */
diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
--- /usr/share/empty/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c 2015-12-10 17:59:16.839499823 +0100
++++ linux/fs/aufs/sbinfo.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,366 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/spl.h linux/fs/aufs/spl.h
--- /usr/share/empty/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/spl.h 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/spl.h 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_SPL_H__ */
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2015-12-10 17:59:16.842833237 +0100
-@@ -0,0 +1,1047 @@
++++ linux/fs/aufs/super.c 2016-01-13 20:11:11.673093671 +0100
+@@ -0,0 +1,1039 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+
+/* ---------------------------------------------------------------------- */
+
-+void au_array_free(void *array)
-+{
-+ if (array) {
-+ if (!is_vmalloc_addr(array))
-+ kfree(array);
-+ else
-+ vfree(array);
-+ }
-+}
-+
+void *au_array_alloc(unsigned long long *hint, au_arraycb_t cb,
+ struct super_block *sb, void *arg)
+{
+
+ for (ull = 0; ull < max; ull++)
+ iput(a[ull]);
-+ au_array_free(a);
++ kvfree(a);
+}
+
+/* ---------------------------------------------------------------------- */
+{
+ int err, do_dx;
+ unsigned int mntflags;
-+ struct au_opts opts;
++ struct au_opts opts = {
++ .opt = NULL
++ };
+ struct dentry *root;
+ struct inode *inode;
+ struct au_sbinfo *sbinfo;
+ }
+
+ err = -ENOMEM;
-+ memset(&opts, 0, sizeof(opts));
+ opts.opt = (void *)__get_free_page(GFP_NOFS);
+ if (unlikely(!opts.opt))
+ goto out;
+ int silent __maybe_unused)
+{
+ int err;
-+ struct au_opts opts;
++ struct au_opts opts = {
++ .opt = NULL
++ };
+ struct au_sbinfo *sbinfo;
+ struct dentry *root;
+ struct inode *inode;
+ }
+
+ err = -ENOMEM;
-+ memset(&opts, 0, sizeof(opts));
+ opts.opt = (void *)__get_free_page(GFP_NOFS);
+ if (unlikely(!opts.opt))
+ goto out;
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2015-12-10 17:59:16.842833237 +0100
-@@ -0,0 +1,642 @@
++++ linux/fs/aufs/super.h 2016-01-13 20:11:11.673093671 +0100
+@@ -0,0 +1,641 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+struct inode *au_iget_locked(struct super_block *sb, ino_t ino);
+typedef unsigned long long (*au_arraycb_t)(struct super_block *sb, void *array,
+ unsigned long long max, void *arg);
-+void au_array_free(void *array);
+void *au_array_alloc(unsigned long long *hint, au_arraycb_t cb,
+ struct super_block *sb, void *arg);
+struct inode **au_iarray_alloc(struct super_block *sb, unsigned long long *max);
+#endif /* __AUFS_SUPER_H__ */
diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
--- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/sysaufs.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
--- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h 2015-09-24 10:47:58.254719746 +0200
++++ linux/fs/aufs/sysaufs.h 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __SYSAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
--- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c 2015-11-11 17:21:46.922197217 +0100
++++ linux/fs/aufs/sysfs.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,376 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
--- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysrq.c 2015-11-11 17:21:46.922197217 +0100
++++ linux/fs/aufs/sysrq.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
--- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c 2015-11-11 17:21:46.922197217 +0100
++++ linux/fs/aufs/vdir.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,888 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2015-09-24 10:47:58.258053165 +0200
++++ linux/fs/aufs/vfsub.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,848 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2015-11-11 17:21:46.922197217 +0100
++++ linux/fs/aufs/vfsub.h 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2015-09-24 10:47:58.258053165 +0200
++++ linux/fs/aufs/wbr_policy.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,765 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2015-09-24 10:47:58.258053165 +0200
-@@ -0,0 +1,1063 @@
++++ linux/fs/aufs/whout.c 2016-01-13 20:11:11.673093671 +0100
+@@ -0,0 +1,1060 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+
+ SiMustAnyLock(sb);
+
-+ whtmp = kmalloc(sizeof(*whtmp), gfp);
++ whtmp = kzalloc(sizeof(*whtmp), gfp);
+ if (unlikely(!whtmp)) {
+ whtmp = ERR_PTR(-ENOMEM);
+ goto out;
+ }
+
-+ whtmp->dir = NULL;
-+ whtmp->br = NULL;
-+ whtmp->wh_dentry = NULL;
+ /* no estimation for dir size */
+ rdhash = au_sbi(sb)->si_rdhash;
+ if (!rdhash)
+}
diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
--- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h 2015-09-24 10:47:58.258053165 +0200
++++ linux/fs/aufs/whout.h 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_WHOUT_H__ */
diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
--- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c 2015-09-24 10:47:58.258053165 +0200
++++ linux/fs/aufs/wkq.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
--- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2015-09-24 10:47:58.258053165 +0200
++++ linux/fs/aufs/wkq.h 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
--- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2015-09-24 10:47:58.258053165 +0200
++++ linux/fs/aufs/xattr.c 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2014-2015 Junjiro R. Okajima
+#endif
diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
--- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c 2015-11-11 17:21:46.922197217 +0100
-@@ -0,0 +1,1296 @@
++++ linux/fs/aufs/xino.c 2016-01-13 20:11:11.673093671 +0100
+@@ -0,0 +1,1318 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+
+/* ---------------------------------------------------------------------- */
+
++static ssize_t xino_fwrite_wkq(vfs_writef_t func, struct file *file, void *buf,
++ size_t size, loff_t *pos);
++
+static ssize_t do_xino_fwrite(vfs_writef_t func, struct file *file, void *kbuf,
+ size_t size, loff_t *pos)
+{
+ void *k;
+ const char __user *u;
+ } buf;
++ int i;
++ const int prevent_endless = 10;
+
++ i = 0;
+ buf.k = kbuf;
+ oldfs = get_fs();
+ set_fs(KERNEL_DS);
+ do {
-+ /* todo: signal_pending? */
+ err = func(file, buf.u, size, pos);
-+ } while (err == -EAGAIN || err == -EINTR);
++ if (err == -EINTR
++ && !au_wkq_test()
++ && fatal_signal_pending(current)) {
++ set_fs(oldfs);
++ err = xino_fwrite_wkq(func, file, kbuf, size, pos);
++ BUG_ON(err == -EINTR);
++ oldfs = get_fs();
++ set_fs(KERNEL_DS);
++ }
++ } while (i++ < prevent_endless
++ && (err == -EAGAIN || err == -EINTR));
+ set_fs(oldfs);
+
+#if 0 /* reserved for future use */
+ *a->errp = do_xino_fwrite(a->func, a->file, a->buf, a->size, a->pos);
+}
+
++static ssize_t xino_fwrite_wkq(vfs_writef_t func, struct file *file, void *buf,
++ size_t size, loff_t *pos)
++{
++ ssize_t err;
++ int wkq_err;
++ struct do_xino_fwrite_args args = {
++ .errp = &err,
++ .func = func,
++ .file = file,
++ .buf = buf,
++ .size = size,
++ .pos = pos
++ };
++
++ /*
++ * it breaks RLIMIT_FSIZE and normal user's limit,
++ * users should care about quota and real 'filesystem full.'
++ */
++ wkq_err = au_wkq_wait(call_do_xino_fwrite, &args);
++ if (unlikely(wkq_err))
++ err = wkq_err;
++
++ return err;
++}
++
+ssize_t xino_fwrite(vfs_writef_t func, struct file *file, void *buf,
+ size_t size, loff_t *pos)
+{
+ ssize_t err;
+
-+ /* todo: signal block and no wkq? */
+ if (rlimit(RLIMIT_FSIZE) == RLIM_INFINITY) {
+ lockdep_off();
+ err = do_xino_fwrite(func, file, buf, size, pos);
+ lockdep_on();
-+ } else {
-+ /*
-+ * it breaks RLIMIT_FSIZE and normal user's limit,
-+ * users should care about quota and real 'filesystem full.'
-+ */
-+ int wkq_err;
-+ struct do_xino_fwrite_args args = {
-+ .errp = &err,
-+ .func = func,
-+ .file = file,
-+ .buf = buf,
-+ .size = size,
-+ .pos = pos
-+ };
-+
-+ wkq_err = au_wkq_wait(call_do_xino_fwrite, &args);
-+ if (unlikely(wkq_err))
-+ err = wkq_err;
-+ }
++ } else
++ err = xino_fwrite_wkq(func, file, buf, size, pos);
+
+ return err;
+}
+ struct au_xino_lock_dir ldir;
+
+ err = -ENOMEM;
-+ st = kzalloc(sizeof(*st), GFP_NOFS);
++ st = kmalloc(sizeof(*st), GFP_NOFS);
+ if (unlikely(!st))
+ goto out;
+
+}
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2015-12-10 17:59:16.856166891 +0100
++++ linux/include/uapi/linux/aufs_type.h 2016-01-13 20:11:11.673093671 +0100
@@ -0,0 +1,419 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+
+#include <linux/limits.h>
+
-+#define AUFS_VERSION "4.3-20151116"
++#define AUFS_VERSION "4.x-rcN-20160111"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
+#define AUFS_CTL_FHSM_FD _IOW(AuCtlType, AuCtl_FHSM_FD, int)
+
+#endif /* __AUFS_TYPE_H__ */
-aufs4.3 loopback patch
+aufs4.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 291ec9e..1b8190d 100644
+index abfdd2b..a2e3c43 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -417,7 +417,7 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
+@@ -556,7 +556,7 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
}
struct switch_request {
struct completion wait;
};
-@@ -437,6 +437,7 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
+@@ -582,6 +582,7 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
mapping = file->f_mapping;
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
lo->lo_backing_file = file;
lo->lo_blocksize = S_ISBLK(mapping->host->i_mode) ?
mapping->host->i_bdev->bd_block_size : PAGE_SIZE;
lo->old_gfp_mask = mapping_gfp_mask(mapping);
-@@ -448,11 +449,13 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
+@@ -594,11 +595,13 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
* First it needs to flush existing IO, it does this by sending a magic
* BIO down the pipe. The completion of this BIO does the actual switch.
*/
/* freeze queue and wait for completion of scheduled requests */
blk_mq_freeze_queue(lo->lo_queue);
-@@ -471,7 +474,16 @@ static int loop_switch(struct loop_device *lo, struct file *file)
+@@ -617,7 +620,16 @@ static int loop_switch(struct loop_device *lo, struct file *file)
*/
static int loop_flush(struct loop_device *lo)
{
}
static void loop_reread_partitions(struct loop_device *lo,
-@@ -508,6 +520,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -654,6 +666,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
unsigned int arg)
{
struct file *file, *old_file;
struct inode *inode;
int error;
-@@ -524,9 +537,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -670,9 +683,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
file = fget(arg);
if (!file)
goto out;
error = -EINVAL;
-@@ -538,17 +558,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -684,17 +704,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
goto out_putf;
/* and ... switch */
out:
return error;
}
-@@ -709,7 +733,7 @@ static void loop_config_discard(struct loop_device *lo)
+@@ -881,7 +905,7 @@ static int loop_prepare_queue(struct loop_device *lo)
static int loop_set_fd(struct loop_device *lo, fmode_t mode,
struct block_device *bdev, unsigned int arg)
{
struct inode *inode;
struct address_space *mapping;
unsigned lo_blocksize;
-@@ -724,6 +748,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -896,6 +920,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
file = fget(arg);
if (!file)
goto out;
error = -EBUSY;
if (lo->lo_state != Lo_unbound)
-@@ -778,6 +808,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -948,6 +978,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
-@@ -809,6 +840,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -980,6 +1011,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
out_putf:
fput(file);
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
-@@ -855,6 +888,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
+@@ -1026,6 +1059,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
static int loop_clr_fd(struct loop_device *lo)
{
struct file *filp = lo->lo_backing_file;
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
-@@ -886,6 +920,7 @@ static int loop_clr_fd(struct loop_device *lo)
+@@ -1057,6 +1091,7 @@ static int loop_clr_fd(struct loop_device *lo)
spin_lock_irq(&lo->lo_lock);
lo->lo_state = Lo_rundown;
lo->lo_backing_file = NULL;
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
-@@ -931,6 +966,8 @@ static int loop_clr_fd(struct loop_device *lo)
+@@ -1101,6 +1136,8 @@ static int loop_clr_fd(struct loop_device *lo)
* bd_mutex which is usually taken before lo_ctl_mutex.
*/
fput(filp);
}
diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index 25e8997..93b6fce 100644
+index fb2237c..c3888c5 100644
--- a/drivers/block/loop.h
+++ b/drivers/block/loop.h
@@ -46,7 +46,7 @@ struct loop_device {
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 3fe10d3..2f32d58 100644
+index 98cfd64..a705a0e 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
-@@ -841,7 +841,10 @@ static const struct super_operations aufs_sop = {
+@@ -832,7 +832,10 @@ static const struct super_operations aufs_sop = {
.statfs = aufs_statfs,
.put_super = aufs_put_super,
.sync_fs = aufs_sync_fs,
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index fabd9d7a..90174cf 100644
+index 8d48506..5246785 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1734,6 +1734,10 @@ struct super_operations {
+@@ -1719,6 +1719,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
CC_STACKPROTECTOR_STRONG all=y
DEBUG_ENTRY all=n
DEBUG_IMR_SELFTEST all=n
+DEBUG_WX all=y
EARLY_PRINTK_EFI all=n
EFI_MIXED all=y
+EFI_PGT_DUMP all=n
IOSF_MBI all=m
IOSF_MBI_DEBUG all=y
KEXEC_FILE all=y
CRYPTO_LRW all=m
CRYPTO_PCBC all=m
CRYPTO_XTS all=m
+CRYPTO_KEYWRAP all=m
#- Hash modes
CRYPTO_CMAC all=m
CRYPTO_HMAC all=y
#- *** FILE: drivers/acpi/Kconfig ***
#-
ACPI ia64=y x86=y
+ACPI_DEBUGGER all=n
ACPI_SLEEP x86=y
ACPI_PROCFS_POWER ia64=y x86=y
ACPI_REV_OVERRIDE_POSSIBLE all=y
BLK_DEV_CRYPTOLOOP all=n
#- file drivers/block/drbd/Kconfig goes here
BLK_DEV_NBD all=m
-BLK_DEV_NVME all=m
BLK_DEV_SKD all=m
BLK_DEV_OSD all=m
BLK_DEV_SX8 all=m
#- DMA Devices
DMA_ENGINE all=y
FSL_DMA ppc=y ppc64=y
-IDMA64 all=m
+INTEL_IDMA64 all=m
INTEL_IOATDMA i386=m x86_64=m
INTEL_MIC_X100_DMA all=m
PCH_DMA all=m
EFI_VARS_PSTORE all=m
EFI_VARS_PSTORE_DEFAULT_DISABLE all=n
EFI_RUNTIME_MAP all=y
+EFI_FAKE_MEMMAP all=n
#-
#- *** FILE: drivers/firmware/google/Kconfig ***
FMC_WRITE_EEPROM all=m
FMC_CHARDEV all=m
+#-
+#- *** FILE: drivers/fpga/Kconfig ***
+#-
+FPGA all=m
+FPGA_MGR_ZYNQ_FPGA all=m
+
#-
#- *** FILE: drivers/gpio/Kconfig ***
#-
GPIOLIB all=y
DEBUG_GPIO all=n
GPIO_SYSFS all=y
+GPIO_AMDPT all=m
GPIO_DWAPB all=m
-GPIO_F7188X all=m
GPIO_GENERIC_PLATFORM all=m
GPIO_ICH all=m
-GPIO_IT8761E all=m
GPIO_LYNXPOINT all=y
+GPIO_VX855 all=m
+GPIO_XILINX powerpc=y
+GPIO_ZX all=y
+GPIO_104_IDIO_16 all=m
+GPIO_F7188X all=m
+GPIO_IT87 all=m
GPIO_SCH all=m
GPIO_SCH311X all=m
GPIO_TS5500 all=m
-GPIO_VX855 all=m
-GPIO_XILINX powerpc=y
GPIO_ADP5588 all=m
GPIO_MAX7300 all=m
GPIO_MAX732X all=m
GPIO_RDC321X all=m
GPIO_74X164 all=m
GPIO_MAX7301 all=m
-GPIO_MCP23S08 all=m
GPIO_MC33880 all=m
-GPIO_ZX all=y
+GPIO_MCP23S08 all=m
GPIO_VIPERBOARD all=m
#-
#- file drivers/gpu/drm/sti/Kconfig goes here
#- file drivers/gpu/drm/amd/amdkfd/Kconfig goes here
#- file drivers/gpu/drm/imx/Kconfig goes here
+#- file drivers/gpu/drm/vc4/Kconfig goes here
#-
#- *** FILE: drivers/gpu/drm/amd/amdgpu/Kconfig ***
HID_BETOP_FF all=m
HID_CHERRY all=m
HID_CHICONY all=m
+HID_CORSAIR all=m
HID_PRODIKEYS all=m
HID_CP2112 all=m
HID_CYPRESS all=m
HID_ELO all=m
HID_EZKEY all=m
HID_GEMBIRD all=m
+HID_GFRM all=m
HID_HOLTEK all=m
HOLTEK_FF all=y
HID_GT683R all=m
SENSORS_MAX6642 all=m
SENSORS_MAX6650 all=m
SENSORS_MAX6697 all=m
+SENSORS_MAX31790 all=m
SENSORS_HTU21 all=m
SENSORS_MCP3021 all=m
SENSORS_MENF21BMC_HWMON all=m
SENSORS_UCD9200 all=m
SENSORS_ZL6100 all=m
+#-
+#- *** FILE: drivers/hwtracing/intel_th/Kconfig ***
+#-
+INTEL_TH all=m
+INTEL_TH_PCI all=m
+INTEL_TH_GTH all=m
+INTEL_TH_STH all=m
+INTEL_TH_MSU all=m
+INTEL_TH_PTI all=m
+INTEL_TH_DEBUG all=n
+
+#-
+#- *** FILE: drivers/hwtracing/stm/Kconfig ***
+#-
+STM all=m
+STM_DUMMY all=n
+STM_SOURCE_CONSOLE all=m
+
#-
#- *** FILE: drivers/i2c/Kconfig ***
#-
#- *** FILE: drivers/iio/Kconfig ***
#-
IIO all=m
-IIO_BUFFER_CB all=y
-IIO_KFIFO_BUF all=m
+#- file drivers/iio/buffer/Kconfig goes here
IIO_TRIGGER all=y
IIO_CONSUMERS_PER_TRIGGER all=2
#- file drivers/iio/accel/Kconfig goes here
#- file drivers/iio/adc/Kconfig goes here
#- file drivers/iio/amplifiers/Kconfig goes here
+#- file drivers/iio/chemical/Kconfig goes here
#- file drivers/iio/common/Kconfig goes here
#- file drivers/iio/dac/Kconfig goes here
#- file drivers/iio/frequency/Kconfig goes here
#- file drivers/iio/magnetometer/Kconfig goes here
#- file drivers/iio/orientation/Kconfig goes here
#- file drivers/iio/trigger/Kconfig goes here
+#- file drivers/iio/potentiometer/Kconfig goes here
#- file drivers/iio/pressure/Kconfig goes here
#- file drivers/iio/proximity/Kconfig goes here
#- file drivers/iio/temperature/Kconfig goes here
MMA8452 all=m
MMA9551 all=m
MMA9553 all=m
+MXC4005 all=m
STK8312 all=m
STK8BA50 all=m
AD7923 all=m
AD799X all=m
CC10001_ADC all=m
+HI8435 all=m
MAX1027 all=m
MAX1363 all=m
MCP320X all=m
#-
AD8366 all=m
+#-
+#- *** FILE: drivers/iio/buffer/Kconfig ***
+#-
+IIO_BUFFER_CB all=y
+IIO_KFIFO_BUF all=m
+
+#-
+#- *** FILE: drivers/iio/chemical/Kconfig ***
+#-
+VZ89X all=m
+
#-
#- *** FILE: drivers/iio/common/ssp_sensors/Kconfig ***
#-
#- *** FILE: drivers/iio/humidity/Kconfig ***
#-
DHT11 all=m
+HDC100X all=m
+HTU21 all=m
SI7005 all=m
SI7020 all=m
ADJD_S311 all=m
AL3320A all=m
APDS9300 all=m
+APDS9960 all=m
BH1750 all=m
CM32181 all=m
CM3232 all=m
TCS3472 all=m
SENSORS_TSL2563 all=m
TSL4531 all=m
+US5182D all=m
VCNL4000 all=m
#-
#-
AK8975 all=m
AK09911 all=m
+BMC150_MAGN all=m
MAG3110 all=m
HID_SENSOR_MAGNETOMETER_3D all=m
MMC35240 all=m
IIO_ST_MAGN_3AXIS all=m
-BMC150_MAGN all=m
#-
#- *** FILE: drivers/iio/orientation/Kconfig ***
HID_SENSOR_INCLINOMETER_3D all=m
HID_SENSOR_DEVICE_ROTATION all=m
+#-
+#- *** FILE: drivers/iio/potentiometer/Kconfig ***
+#-
+MCP4531 all=m
+
#-
#- *** FILE: drivers/iio/pressure/Kconfig ***
#-
MS5611 all=m
MS5611_I2C all=m
MS5611_SPI all=m
+MS5637 all=m
IIO_ST_PRESS all=m
T5403 all=m
#- *** FILE: drivers/iio/proximity/Kconfig ***
#-
AS3935 all=m
+LIDAR_LITE_V2 all=m
SX9500 all=m
#-
#-
MLX90614 all=m
TMP006 all=m
+TSYS01 all=m
+TSYS02D all=m
#-
#- *** FILE: drivers/iio/trigger/Kconfig ***
SERIO_PS2MULT all=m
SERIO_ARC_PS2 all=m
HYPERV_KEYBOARD all=m
+USERIO all=m
#-
#- *** FILE: drivers/input/tablet/Kconfig ***
TOUCHSCREEN_HAMPSHIRE all=m
TOUCHSCREEN_EETI all=m
TOUCHSCREEN_EGALAX all=m
+TOUCHSCREEN_FT6236 all=m
TOUCHSCREEN_FUJITSU all=m
TOUCHSCREEN_GOODIX all=m
TOUCHSCREEN_ILI210X all=m
TOUCHSCREEN_USB_NEXIO all=y
TOUCHSCREEN_TOUCHIT213 all=m
TOUCHSCREEN_TSC_SERIO all=m
+TOUCHSCREEN_TSC2004 all=m
TOUCHSCREEN_TSC2005 all=m
TOUCHSCREEN_TSC2007 all=m
TOUCHSCREEN_W90X900 all=m
TOUCHSCREEN_SX8654 all=m
TOUCHSCREEN_TPS6507X all=m
TOUCHSCREEN_ZFORCE all=m
+TOUCHSCREEN_ROHM_BU21023 all=m
#-
#- *** FILE: drivers/iommu/Kconfig ***
IOMMU_SUPPORT all=y
AMD_IOMMU_V2 all=m
INTEL_IOMMU all=y
+INTEL_IOMMU_SVM all=y
INTEL_IOMMU_DEFAULT_ON all=y
IRQ_REMAP all=y
#-
LGUEST i386=m
+#-
+#- *** FILE: drivers/lightnvm/Kconfig ***
+#-
+NVM all=y
+NVM_DEBUG all=n
+NVM_GENNVM all=m
+NVM_RRPC all=m
+
#-
#- *** FILE: drivers/macintosh/Kconfig ***
#-
INTEL_MIC_CARD all=m
#- SCIF Driver
SCIF all=m
+#- Intel MIC Coprocessor State Management (COSM) Drivers
+MIC_COSM all=m
#-
#- *** FILE: drivers/misc/ti-st/Kconfig ***
SDIO_UART all=m
MMC_TEST all=n
-#-
-#- *** FILE: drivers/mmc/core/Kconfig ***
-#-
-MMC_CLKGATE all=n
-
#-
#- *** FILE: drivers/mmc/host/Kconfig ***
#-
#- file drivers/net/ethernet/apple/Kconfig goes here
#- file drivers/net/ethernet/arc/Kconfig goes here
#- file drivers/net/ethernet/atheros/Kconfig goes here
+#- file drivers/net/ethernet/aurora/Kconfig goes here
#- file drivers/net/ethernet/cadence/Kconfig goes here
#- file drivers/net/ethernet/adi/Kconfig goes here
#- file drivers/net/ethernet/broadcom/Kconfig goes here
#- file drivers/net/ethernet/intel/Kconfig goes here
#- file drivers/net/ethernet/i825xx/Kconfig goes here
#- file drivers/net/ethernet/xscale/Kconfig goes here
-#- file drivers/net/ethernet/icplus/Kconfig goes here
JME all=m
#- file drivers/net/ethernet/marvell/Kconfig goes here
#- file drivers/net/ethernet/mellanox/Kconfig goes here
ATL1C all=m
ALX all=m
+#-
+#- *** FILE: drivers/net/ethernet/aurora/Kconfig ***
+#-
+NET_VENDOR_AURORA all=y
+AURORA_NB8800 all=m
+
#-
#- *** FILE: drivers/net/ethernet/broadcom/Kconfig ***
#-
BNX2X all=m
BNX2X_SRIOV all=y
BNX2X_VXLAN all=y
+BNXT all=m
+BNXT_SRIOV all=y
#-
#- *** FILE: drivers/net/ethernet/brocade/Kconfig ***
IBMVETH ppc64=m
#- file drivers/net/ethernet/ibm/emac/Kconfig goes here
-#-
-#- *** FILE: drivers/net/ethernet/icplus/Kconfig ***
-#-
-IP1000 all=m
-
#-
#- *** FILE: drivers/net/ethernet/intel/Kconfig ***
#-
MLXSW_CORE all=m
MLXSW_PCI all=m
MLXSW_SWITCHX2 all=m
+MLXSW_SPECTRUM all=m
#-
#- *** FILE: drivers/net/ethernet/micrel/Kconfig ***
NET_VENDOR_MICROCHIP all=y
ENC28J60 all=m
ENC28J60_WRITEVERIFY all=n
+ENCX24J600 all=m
#-
#- *** FILE: drivers/net/ethernet/myricom/Kconfig ***
QLCNIC_HWMON all=y
QLGE all=m
NETXEN_NIC all=m sparc=n
+QED all=m
+QEDE all=m
#-
#- *** FILE: drivers/net/ethernet/qualcomm/Kconfig ***
IEEE802154_DRIVERS all=m
IEEE802154_FAKELB all=m
IEEE802154_AT86RF230 all=m
+IEEE802154_AT86RF230_DEBUGFS all=n
IEEE802154_MRF24J40 all=m
IEEE802154_CC2520 all=m
IEEE802154_ATUSB all=m
PRISM54 all=m
USB_ZD1201 all=m
USB_NET_RNDIS_WLAN all=m
-#- file drivers/net/wireless/rtl818x/Kconfig goes here
ADM8211 all=m
+#- file drivers/net/wireless/realtek/rtl818x/Kconfig goes here
MAC80211_HWSIM all=m
MWL8K all=m
#- file drivers/net/wireless/ath/Kconfig goes here
#- file drivers/net/wireless/p54/Kconfig goes here
#- file drivers/net/wireless/rt2x00/Kconfig goes here
#- file drivers/net/wireless/mediatek/Kconfig goes here
-#- file drivers/net/wireless/rtlwifi/Kconfig goes here
+#- file drivers/net/wireless/realtek/rtlwifi/Kconfig goes here
+#- file drivers/net/wireless/realtek/rtl8xxxu/Kconfig goes here
#- file drivers/net/wireless/ti/Kconfig goes here
#- file drivers/net/wireless/zd1211rw/Kconfig goes here
#- file drivers/net/wireless/mwifiex/Kconfig goes here
B43_BUSES_BCMA_AND_SSB all=y
B43_BUSES_BCMA all=n
B43_BUSES_SSB all=n
-B43_PCMCIA all=y
B43_SDIO all=y
B43_PHY_G all=y
B43_PHY_N all=y
P54_SPI all=m
P54_SPI_DEFAULT_EEPROM all=y
+#-
+#- *** FILE: drivers/net/wireless/realtek/rtl818x/Kconfig ***
+#-
+RTL8180 all=m
+RTL8187 all=m
+
+#-
+#- *** FILE: drivers/net/wireless/realtek/rtl8xxxu/Kconfig ***
+#-
+RTL8XXXU all=m
+RTL8XXXU_UNTESTED all=y
+
+#-
+#- *** FILE: drivers/net/wireless/realtek/rtlwifi/Kconfig ***
+#-
+RTL_CARDS all=m
+RTL8192CE all=m
+RTL8192SE all=m
+RTL8192DE all=m
+RTL8723AE all=m
+RTL8723BE all=m
+RTL8188EE all=m
+RTL8192EE all=m
+RTL8821AE all=m
+RTL8192CU all=m
+RTLWIFI all=m
+RTLWIFI_DEBUG all=n
+RTL8192C_COMMON all=m
+
#-
#- *** FILE: drivers/net/wireless/rsi/Kconfig ***
#-
RT2800USB_UNKNOWN all=y
RT2X00_DEBUG all=n
-#-
-#- *** FILE: drivers/net/wireless/rtl818x/Kconfig ***
-#-
-RTL8180 all=m
-RTL8187 all=m
-
-#-
-#- *** FILE: drivers/net/wireless/rtlwifi/Kconfig ***
-#-
-RTL_CARDS all=m
-RTL8192CE all=m
-RTL8192SE all=m
-RTL8192DE all=m
-RTL8723AE all=m
-RTL8723BE all=m
-RTL8188EE all=m
-RTL8192EE all=m
-RTL8821AE all=m
-RTL8192CU all=m
-RTLWIFI all=m
-RTLWIFI_DEBUG all=n
-RTL8192C_COMMON all=m
-
#-
#- *** FILE: drivers/net/wireless/ti/Kconfig ***
#-
NFC_MEI_PHY all=m
NFC_SIM all=m
NFC_PORT100 all=m
+#- file drivers/nfc/fdp/Kconfig goes here
#- file drivers/nfc/pn544/Kconfig goes here
#- file drivers/nfc/microread/Kconfig goes here
#- file drivers/nfc/nfcmrvl/Kconfig goes here
#- file drivers/nfc/nxp-nci/Kconfig goes here
#- file drivers/nfc/s3fwrn5/Kconfig goes here
+#-
+#- *** FILE: drivers/nfc/fdp/Kconfig ***
+#-
+NFC_FDP all=m
+NFC_FDP_I2C all=m
+
#-
#- *** FILE: drivers/nfc/microread/Kconfig ***
#-
NFC_MRVL all=m
NFC_MRVL_USB all=m
NFC_MRVL_UART all=m
+NFC_MRVL_I2C all=m
+NFC_MRVL_SPI all=m
#-
#- *** FILE: drivers/nfc/nxp-nci/Kconfig ***
ND_BLK all=m
BTT all=y
+#-
+#- *** FILE: drivers/nvme/host/Kconfig ***
+#-
+BLK_DEV_NVME all=m
+
#-
#- *** FILE: drivers/nvmem/Kconfig ***
#-
#-
PINCTRL_BAYTRAIL all=y
PINCTRL_CHERRYVIEW all=m
+PINCTRL_BROXTON all=m
PINCTRL_SUNRISEPOINT all=m
#-
ACPI_TOSHIBA i386=m x86_64=m
TOSHIBA_BT_RFKILL all=m
TOSHIBA_HAPS all=m
+TOSHIBA_WMI all=m
ACPI_CMPC all=m
INTEL_SCU_IPC i386=y
GPIO_INTEL_PMIC i386=y
BATTERY_DS2782 all=m
BATTERY_PMU ppc=m
BATTERY_SBS all=m
-BATTERY_BQ27x00 all=m
-BATTERY_BQ27X00_I2C all=y
-BATTERY_BQ27X00_PLATFORM all=y
+BATTERY_BQ27XXX all=m
+BATTERY_BQ27XXX_I2C all=y
+BATTERY_BQ27XXX_PLATFORM all=y
BATTERY_DA9030 all=m
BATTERY_DA9052 all=m
BATTERY_MAX17040 all=m
CHARGER_BQ24735 all=m
CHARGER_BQ25890 all=m
CHARGER_SMB347 all=m
+CHARGER_TPS65217 all=m
BATTERY_GAUGE_LTC2941 all=m
AB8500_BM all=n
BATTERY_GOLDFISH all=m
PWM_LPSS all=m
PWM_LPSS_PCI all=m
PWM_LPSS_PLATFORM all=m
+PWM_PCA9685 all=m
#-
#- *** FILE: drivers/rapidio/Kconfig ***
RTC_DRV_RX8025 all=m
RTC_DRV_EM3027 all=m
RTC_DRV_RV3029C2 all=m
+RTC_DRV_RV8803 all=m
#- SPI RTC drivers
RTC_DRV_M41T93 all=m
RTC_DRV_M41T94 all=m
SCSI_ARCMSR all=m sparc=n
#- file drivers/scsi/esas2r/Kconfig goes here
#- file drivers/scsi/megaraid/Kconfig.megaraid goes here
-#- file drivers/scsi/mpt2sas/Kconfig goes here
#- file drivers/scsi/mpt3sas/Kconfig goes here
#- file drivers/scsi/ufs/Kconfig goes here
SCSI_HPTIOP all=m sparc=n
MEGARAID_LEGACY all=m
MEGARAID_SAS all=m
-#-
-#- *** FILE: drivers/scsi/mpt2sas/Kconfig ***
-#-
-SCSI_MPT2SAS all=m
-SCSI_MPT2SAS_MAX_SGE all=128
-SCSI_MPT2SAS_LOGGING all=y
-
#-
#- *** FILE: drivers/scsi/mpt3sas/Kconfig ***
#-
SCSI_MPT3SAS all=m
+SCSI_MPT2SAS_MAX_SGE all=128
SCSI_MPT3SAS_MAX_SGE all=128
-SCSI_MPT3SAS_LOGGING all=y
+SCSI_MPT2SAS all=m
#-
#- *** FILE: drivers/scsi/mvsas/Kconfig ***
SSB all=m
SSB_PCMCIAHOST all=y
SSB_SDIOHOST sparc=y
+SSB_HOST_SOC all=y
SSB_SILENT all=n
SSB_DEBUG all=n
SSB_DRIVER_GPIO all=y
#- file drivers/staging/sm750fb/Kconfig goes here
#- file drivers/staging/xgifb/Kconfig goes here
#- file drivers/staging/emxx_udc/Kconfig goes here
-#- file drivers/staging/ft1000/Kconfig goes here
#- file drivers/staging/speakup/Kconfig goes here
#- file drivers/staging/ste_rmi4/Kconfig goes here
#- file drivers/staging/nvec/Kconfig goes here
COMEDI_DT2817 all=m
COMEDI_DT282X all=m
COMEDI_DMM32AT all=m
-COMEDI_UNIOXX5 all=m
COMEDI_FL512 all=m
COMEDI_AIO_AIO12_8 all=m
COMEDI_AIO_IIRO_16 all=m
FB_TFT_SSD1331 all=m
FB_TFT_SSD1351 all=m
FB_TFT_ST7735R all=m
+FB_TFT_ST7789V all=m
FB_TFT_TINYLCD all=m
FB_TFT_TLS8204 all=m
FB_TFT_UC1611 all=m
FB_FLEX all=m
FB_TFT_FBTFT_DEVICE all=m
-#-
-#- *** FILE: drivers/staging/ft1000/Kconfig ***
-#-
-FT1000 all=m
-FT1000_USB all=m
-FT1000_PCMCIA all=m
-
#-
#- *** FILE: drivers/staging/fwserial/Kconfig ***
#-
UNISYSSPAR all=y
#- file drivers/staging/unisys/visorbus/Kconfig goes here
#- file drivers/staging/unisys/visornic/Kconfig goes here
+#- file drivers/staging/unisys/visorinput/Kconfig goes here
+#- file drivers/staging/unisys/visorhba/Kconfig goes here
#-
#- *** FILE: drivers/staging/unisys/visorbus/Kconfig ***
#-
UNISYS_VISORBUS all=m
+#-
+#- *** FILE: drivers/staging/unisys/visorhba/Kconfig ***
+#-
+UNISYS_VISORHBA all=m
+
+#-
+#- *** FILE: drivers/staging/unisys/visorinput/Kconfig ***
+#-
+UNISYS_VISORINPUT all=m
+
#-
#- *** FILE: drivers/staging/unisys/visornic/Kconfig ***
#-
#-
VT6656 all=m
+#-
+#- *** FILE: drivers/staging/wilc1000/Kconfig ***
+#-
+WILC1000_DRIVER all=n
+WILC1000_PREALLOCATE_AT_LOADING_DRIVER all=y
+WILC1000_DYNAMICALLY_ALLOCATE_MEMROY all=n
+WILC1000_SDIO all=y
+WILC1000_SPI all=n
+WILC1000_HW_OOB_INTR all=y
+
#-
#- *** FILE: drivers/staging/wlan-ng/Kconfig ***
#-
SERIAL_8250_DETECT_IRQ all=y
SERIAL_8250_RSA all=y
SERIAL_8250_DW all=m
+SERIAL_8250_RT288X all=y
SERIAL_8250_FINTEK all=m
+SERIAL_8250_MID all=m
#-
#- *** FILE: drivers/tty/serial/Kconfig ***
USB_OXU210HP_HCD all=m
USB_ISP116X_HCD all=m
USB_ISP1362_HCD all=m
-USB_FUSBH200_HCD all=m
USB_FOTG210_HCD all=m
USB_MAX3421_HCD all=m
USB_OHCI_HCD all=m
VFIO all=m
#- file drivers/vfio/pci/Kconfig goes here
#- file drivers/vfio/platform/Kconfig goes here
+#- file virt/lib/Kconfig goes here
#-
#- *** FILE: drivers/vfio/pci/Kconfig ***
FB_SM501 all=m
FB_SMSCUFX all=m
FB_UDL all=m
-FB_IBM_GXT4500 ppc=m ppc64=m
+FB_IBM_GXT4500 all=m
FB_PS3 ppc64=y
FB_PS3_DEFAULT_SIZE_M ppc64=18
FB_GOLDFISH all=m
W83977F_WDT i386=m x86_64=m
MACHZ_WDT i386=m x86_64=m
SBC_EPX_C3_WATCHDOG i386=m x86_64=m
+BCM7038_WDT all=m
MPC5200_WDT ppc=m
MEN_A21_WDT all=m
WATCHDOG_RTAS ppc=m ppc64=m
UBIFS_FS_ADVANCED_COMPR all=y
UBIFS_FS_LZO all=y
UBIFS_FS_ZLIB all=y
+UBIFS_ATIME_SUPPORT all=y
#-
#- *** FILE: fs/udf/Kconfig ***
MODULE_COMPRESS all=y
MODULE_COMPRESS_GZIP all=n
MODULE_COMPRESS_XZ all=y
-STOP_MACHINE all=y
#- file block/Kconfig goes here
#- file kernel/Kconfig.locks goes here
RING_BUFFER_BENCHMARK all=m
RING_BUFFER_STARTUP_TEST all=n
TRACE_ENUM_MAP_FILE all=n
+TRACING_EVENTS_GPIO all=y
#-
#- *** FILE: lib/Kconfig ***
DEBUG_FS all=y
HEADERS_CHECK all=y
DEBUG_SECTION_MISMATCH all=n
+SECTION_MISMATCH_WARN_ONLY all=y
FRAME_POINTER i386=y x86_64=y
DEBUG_FORCE_WEAK_PER_CPU all=n
MAGIC_SYSRQ all=y
TEST_HEXDUMP all=m
TEST_STRING_HELPERS all=m
TEST_KSTRTOX all=m
+TEST_PRINTF all=m
TEST_RHASHTABLE all=n
PROVIDE_OHCI1394_DMA_INIT all=n
BUILD_DOCSRC all=n
#- file net/mpls/Kconfig goes here
#- file net/hsr/Kconfig goes here
#- file net/switchdev/Kconfig goes here
+#- file net/l3mdev/Kconfig goes here
RFS_ACCEL all=y
CGROUP_NET_PRIO all=y
BPF_JIT all=y
#- *** FILE: net/ieee802154/Kconfig ***
#-
IEEE802154 all=m
+IEEE802154_NL802154_EXPERIMENTAL all=y
IEEE802154_SOCKET all=m
#- file net/ieee802154/6lowpan/Kconfig goes here
L2TP_IP all=m
L2TP_ETH all=m
+#-
+#- *** FILE: net/l3mdev/Kconfig ***
+#-
+NET_L3_MASTER_DEV all=y
+
#-
#- *** FILE: net/lapb/Kconfig ***
#-
NF_CT_NETLINK all=m
NF_CT_NETLINK_TIMEOUT all=m
NF_CT_NETLINK_HELPER all=m
-NETFILTER_NETLINK_QUEUE_CT all=y
+NETFILTER_NETLINK_GLUE_CT all=y
NF_NAT all=m
NF_NAT_REDIRECT all=m
NF_TABLES all=m
SND_SCS1X all=m
SND_FIREWORKS all=m
SND_BEBOB all=m
+SND_FIREWIRE_DIGI00X all=m
+SND_FIREWIRE_TASCAM all=m
#-
#- *** FILE: sound/hda/Kconfig ***
#- file sound/soc/sirf/Kconfig goes here
#- file sound/soc/spear/Kconfig goes here
#- file sound/soc/sti/Kconfig goes here
+#- file sound/soc/sunxi/Kconfig goes here
#- file sound/soc/tegra/Kconfig goes here
#- file sound/soc/txx9/Kconfig goes here
#- file sound/soc/ux500/Kconfig goes here
SND_SOC_ADAU1701 all=m
SND_SOC_AK4104 all=m
SND_SOC_AK4554 all=m
+SND_SOC_AK4613 all=m
SND_SOC_AK4641 all=m
SND_SOC_AK4642 all=m
SND_SOC_AK5386 all=m
SND_SOC_CS4271_SPI all=m
SND_SOC_CS42XX8_I2C all=m
SND_SOC_CS4349 all=m
-SND_SOC_HDMI_CODEC all=m
SND_SOC_ES8328 all=m
SND_SOC_GTM601 all=m
SND_SOC_MAX98095 all=m
SND_SOC_INTEL_CHT_BSW_RT5672_MACH all=m
SND_SOC_INTEL_CHT_BSW_RT5645_MACH all=m
SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH all=m
+SND_SOC_INTEL_SKL_RT286_MACH all=m
#-
#- *** FILE: sound/soc/qcom/Kconfig ***
#-
SND_SOC_QCOM all=m
+#-
+#- *** FILE: sound/soc/sunxi/Kconfig ***
+#-
+SND_SUN4I_CODEC all=m
+
#-
#- *** FILE: sound/soc/xtensa/Kconfig ***
#-
#-
AMD_XGBE_PHY all=m
ARM_AT91_ETHER all=m
+B43_PCMCIA all=y
+BATTERY_BQ27X00_I2C all=y
+BATTERY_BQ27X00_PLATFORM all=y
+BATTERY_BQ27x00 all=m
BLK_DEV_CELLEB ppc64=m
BLK_DEV_XIP all=y
+COMEDI_UNIOXX5 all=m
DEFAULT_SECURITY_YAMA all=n
DRM_I915_FBDEV all=y
DRM_I915_KMS all=y
EXT4_USE_FOR_EXT23 all=y
FB_SM7XX all=m
FS_XIP all=y
+FT1000 all=m
+FT1000_PCMCIA all=m
+FT1000_USB all=m
GENEVE_CORE all=m
+GPIO_IT8761E all=m
HID_HUION all=m
HVC_BEAT ppc64=n
I2O all=m sparc=n
I2O_LCT_NOTIFY_ON_CHANGES all=y
I2O_PROC all=m
I2O_SCSI all=m
+IDMA64 all=m
INIT_FALLBACK all=y
INTEL_MID_DMAC all=m
+IP1000 all=m
JBD all=m
JBD_DEBUG all=n
KEYS_DEBUG_PROC_KEYS all=n
LINE6_USB all=m
LINE6_USB_IMPULSE_RESPONSE all=n
MEDIA_PARPORT_SUPPORT all=y
+MMC_CLKGATE all=n
+NETFILTER_NETLINK_QUEUE_CT all=y
NFC_ST21NFCB all=m
NFC_ST21NFCB_I2C all=m
PATA_SCC ppc64=m
RCU_FANOUT_EXACT all=n
RCU_USER_QS all=n
RT_MUTEX_TESTER all=n
+SCSI_MPT2SAS_LOGGING all=y
+SCSI_MPT3SAS_LOGGING all=y
SECURITY_YAMA_STACKED all=y
SERIAL_MFD_HSU all=m
SERIAL_MRST_MAX3110 all=m
SND_HDA_INPUT_JACK all=y
+SND_SOC_HDMI_CODEC all=m
+STOP_MACHINE all=y
SUNRPC_XPRT_RDMA_CLIENT all=m
SUNRPC_XPRT_RDMA_SERVER all=m
TCG_ST33_I2C all=m
UNISYS_VISORCHIPSET all=m
UNISYS_VISORUTIL all=m
USB_DWC3_DEBUG all=n
+USB_FUSBH200_HCD all=m
USB_WPAN_HCD all=m
VIDEO_BTCX all=m sparc=
VIDEO_BWQCAM all=m
fi
done
-From 7a29ac474a47eb8cf212b45917683ae89d6fa13b Mon Sep 17 00:00:00 2001
-From: Chris Mason <clm@fb.com>
-Date: Tue, 10 Nov 2015 10:10:34 +1100
-Subject: xfs: give all workqueues rescuer threads
-
-We're consistently hitting deadlocks here with XFS on recent kernels.
-After some digging through the crash files, it looks like everyone in
-the system is waiting for XFS to reclaim memory.
-
-Something like this:
-
-PID: 2733434 TASK: ffff8808cd242800 CPU: 19 COMMAND: "java"
- #0 [ffff880019c53588] __schedule at ffffffff818c4df2
- #1 [ffff880019c535d8] schedule at ffffffff818c5517
- #2 [ffff880019c535f8] _xfs_log_force_lsn at ffffffff81316348
- #3 [ffff880019c53688] xfs_log_force_lsn at ffffffff813164fb
- #4 [ffff880019c536b8] xfs_iunpin_wait at ffffffff8130835e
- #5 [ffff880019c53728] xfs_reclaim_inode at ffffffff812fd453
- #6 [ffff880019c53778] xfs_reclaim_inodes_ag at ffffffff812fd8c7
- #7 [ffff880019c53928] xfs_reclaim_inodes_nr at ffffffff812fe433
- #8 [ffff880019c53958] xfs_fs_free_cached_objects at ffffffff8130d3b9
- #9 [ffff880019c53968] super_cache_scan at ffffffff811a6f73
-#10 [ffff880019c539c8] shrink_slab at ffffffff811460e6
-#11 [ffff880019c53aa8] shrink_zone at ffffffff8114a53f
-#12 [ffff880019c53b48] do_try_to_free_pages at ffffffff8114a8ba
-#13 [ffff880019c53be8] try_to_free_pages at ffffffff8114ad5a
-#14 [ffff880019c53c78] __alloc_pages_nodemask at ffffffff8113e1b8
-#15 [ffff880019c53d88] alloc_kmem_pages_node at ffffffff8113e671
-#16 [ffff880019c53dd8] copy_process at ffffffff8104f781
-#17 [ffff880019c53ec8] do_fork at ffffffff8105129c
-#18 [ffff880019c53f38] sys_clone at ffffffff810515b6
-#19 [ffff880019c53f48] stub_clone at ffffffff818c8e4d
-
-xfs_log_force_lsn is waiting for logs to get cleaned, which is waiting
-for IO, which is waiting for workers to complete the IO which is waiting
-for worker threads that don't exist yet:
-
-PID: 2752451 TASK: ffff880bd6bdda00 CPU: 37 COMMAND: "kworker/37:1"
- #0 [ffff8808d20abbb0] __schedule at ffffffff818c4df2
- #1 [ffff8808d20abc00] schedule at ffffffff818c5517
- #2 [ffff8808d20abc20] schedule_timeout at ffffffff818c7c6c
- #3 [ffff8808d20abcc0] wait_for_completion_killable at ffffffff818c6495
- #4 [ffff8808d20abd30] kthread_create_on_node at ffffffff8106ec82
- #5 [ffff8808d20abdf0] create_worker at ffffffff8106752f
- #6 [ffff8808d20abe40] worker_thread at ffffffff810699be
- #7 [ffff8808d20abec0] kthread at ffffffff8106ef59
- #8 [ffff8808d20abf50] ret_from_fork at ffffffff818c8ac8
-
-I think we should be using WQ_MEM_RECLAIM to make sure this thread
-pool makes progress when we're not able to allocate new workers.
-
-[dchinner: make all workqueues WQ_MEM_RECLAIM]
-
-Signed-off-by: Chris Mason <clm@fb.com>
-Reviewed-by: Dave Chinner <dchinner@redhat.com>
-Signed-off-by: Dave Chinner <david@fromorbit.com>
----
- fs/xfs/xfs_super.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
-index 29531ec..65fbfb7 100644
---- a/fs/xfs/xfs_super.c
-+++ b/fs/xfs/xfs_super.c
-@@ -838,17 +838,18 @@ xfs_init_mount_workqueues(
- goto out_destroy_unwritten;
-
- mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s",
-- WQ_FREEZABLE, 0, mp->m_fsname);
-+ WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);
- if (!mp->m_reclaim_workqueue)
- goto out_destroy_cil;
-
- mp->m_log_workqueue = alloc_workqueue("xfs-log/%s",
-- WQ_FREEZABLE|WQ_HIGHPRI, 0, mp->m_fsname);
-+ WQ_MEM_RECLAIM|WQ_FREEZABLE|WQ_HIGHPRI, 0,
-+ mp->m_fsname);
- if (!mp->m_log_workqueue)
- goto out_destroy_reclaim;
-
- mp->m_eofblocks_workqueue = alloc_workqueue("xfs-eofblocks/%s",
-- WQ_FREEZABLE, 0, mp->m_fsname);
-+ WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);
- if (!mp->m_eofblocks_workqueue)
- goto out_destroy_log;
-
---
-cgit v0.11.2
-
-commit c2d42c16ad83006a706d83e51a7268db04af733a
-Author: Andrew Morton <akpm@linux-foundation.org>
-Date: Thu Nov 5 18:48:43 2015 -0800
-
- mm/vmstat.c: uninline node_page_state()
-
- With x86_64 (config http://ozlabs.org/~akpm/config-akpm2.txt) and old gcc
- (4.4.4), drivers/base/node.c:node_read_meminfo() is using 2344 bytes of
- stack. Uninlining node_page_state() reduces this to 440 bytes.
-
- The stack consumption issue is fixed by newer gcc (4.8.4) however with
- that compiler this patch reduces the node.o text size from 7314 bytes to
- 4578.
-
- Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
- Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
-diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
-index 82e7db7..49dfe40 100644
---- a/include/linux/vmstat.h
-+++ b/include/linux/vmstat.h
-@@ -161,30 +161,8 @@ static inline unsigned long zone_page_state_snapshot(struct zone *zone,
- }
-
- #ifdef CONFIG_NUMA
--/*
-- * Determine the per node value of a stat item. This function
-- * is called frequently in a NUMA machine, so try to be as
-- * frugal as possible.
-- */
--static inline unsigned long node_page_state(int node,
-- enum zone_stat_item item)
--{
-- struct zone *zones = NODE_DATA(node)->node_zones;
--
-- return
--#ifdef CONFIG_ZONE_DMA
-- zone_page_state(&zones[ZONE_DMA], item) +
--#endif
--#ifdef CONFIG_ZONE_DMA32
-- zone_page_state(&zones[ZONE_DMA32], item) +
--#endif
--#ifdef CONFIG_HIGHMEM
-- zone_page_state(&zones[ZONE_HIGHMEM], item) +
--#endif
-- zone_page_state(&zones[ZONE_NORMAL], item) +
-- zone_page_state(&zones[ZONE_MOVABLE], item);
--}
-
-+extern unsigned long node_page_state(int node, enum zone_stat_item item);
- extern void zone_statistics(struct zone *, struct zone *, gfp_t gfp);
-
- #else
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index fbf1448..ffcb4f5 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -591,6 +591,28 @@ void zone_statistics(struct zone *preferred_zone, struct zone *z, gfp_t flags)
- else
- __inc_zone_state(z, NUMA_OTHER);
- }
-+
-+/*
-+ * Determine the per node value of a stat item.
-+ */
-+unsigned long node_page_state(int node, enum zone_stat_item item)
-+{
-+ struct zone *zones = NODE_DATA(node)->node_zones;
-+
-+ return
-+#ifdef CONFIG_ZONE_DMA
-+ zone_page_state(&zones[ZONE_DMA], item) +
-+#endif
-+#ifdef CONFIG_ZONE_DMA32
-+ zone_page_state(&zones[ZONE_DMA32], item) +
-+#endif
-+#ifdef CONFIG_HIGHMEM
-+ zone_page_state(&zones[ZONE_HIGHMEM], item) +
-+#endif
-+ zone_page_state(&zones[ZONE_NORMAL], item) +
-+ zone_page_state(&zones[ZONE_MOVABLE], item);
-+}
-+
- #endif
-
- #ifdef CONFIG_COMPACTION
-commit 016c13daa5c9e4827eca703e2f0621c131f2cca3
-Author: Mel Gorman <mgorman@techsingularity.net>
-Date: Fri Nov 6 16:28:18 2015 -0800
-
- mm, page_alloc: use masks and shifts when converting GFP flags to migrate types
-
- This patch redefines which GFP bits are used for specifying mobility and
- the order of the migrate types. Once redefined it's possible to convert
- GFP flags to a migrate type with a simple mask and shift. The only
- downside is that readers of OOM kill messages and allocation failures may
- have been used to the existing values but scripts/gfp-translate will help.
-
- Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
- Acked-by: Vlastimil Babka <vbabka@suse.cz>
- Cc: Christoph Lameter <cl@linux.com>
- Cc: David Rientjes <rientjes@google.com>
- Cc: Johannes Weiner <hannes@cmpxchg.org>
- Cc: Michal Hocko <mhocko@suse.com>
- Cc: Vitaly Wool <vitalywool@gmail.com>
- Cc: Rik van Riel <riel@redhat.com>
- Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
- Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
-diff --git a/include/linux/gfp.h b/include/linux/gfp.h
-index f92cbd2..440fca3 100644
---- a/include/linux/gfp.h
-+++ b/include/linux/gfp.h
-@@ -14,7 +14,7 @@ struct vm_area_struct;
- #define ___GFP_HIGHMEM 0x02u
- #define ___GFP_DMA32 0x04u
- #define ___GFP_MOVABLE 0x08u
--#define ___GFP_WAIT 0x10u
-+#define ___GFP_RECLAIMABLE 0x10u
- #define ___GFP_HIGH 0x20u
- #define ___GFP_IO 0x40u
- #define ___GFP_FS 0x80u
-@@ -29,7 +29,7 @@ struct vm_area_struct;
- #define ___GFP_NOMEMALLOC 0x10000u
- #define ___GFP_HARDWALL 0x20000u
- #define ___GFP_THISNODE 0x40000u
--#define ___GFP_RECLAIMABLE 0x80000u
-+#define ___GFP_WAIT 0x80000u
- #define ___GFP_NOACCOUNT 0x100000u
- #define ___GFP_NOTRACK 0x200000u
- #define ___GFP_NO_KSWAPD 0x400000u
-@@ -126,6 +126,7 @@ struct vm_area_struct;
-
- /* This mask makes up all the page movable related flags */
- #define GFP_MOVABLE_MASK (__GFP_RECLAIMABLE|__GFP_MOVABLE)
-+#define GFP_MOVABLE_SHIFT 3
-
- /* Control page allocator reclaim behavior */
- #define GFP_RECLAIM_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|\
-@@ -152,14 +153,15 @@ struct vm_area_struct;
- /* Convert GFP flags to their corresponding migrate type */
- static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
- {
-- WARN_ON((gfp_flags & GFP_MOVABLE_MASK) == GFP_MOVABLE_MASK);
-+ VM_WARN_ON((gfp_flags & GFP_MOVABLE_MASK) == GFP_MOVABLE_MASK);
-+ BUILD_BUG_ON((1UL << GFP_MOVABLE_SHIFT) != ___GFP_MOVABLE);
-+ BUILD_BUG_ON((___GFP_MOVABLE >> GFP_MOVABLE_SHIFT) != MIGRATE_MOVABLE);
-
- if (unlikely(page_group_by_mobility_disabled))
- return MIGRATE_UNMOVABLE;
-
- /* Group based on mobility */
-- return (((gfp_flags & __GFP_MOVABLE) != 0) << 1) |
-- ((gfp_flags & __GFP_RECLAIMABLE) != 0);
-+ return (gfp_flags & GFP_MOVABLE_MASK) >> GFP_MOVABLE_SHIFT;
- }
-
- #ifdef CONFIG_HIGHMEM
-diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index e326843..38bed71 100644
---- a/include/linux/mmzone.h
-+++ b/include/linux/mmzone.h
-@@ -37,8 +37,8 @@
-
- enum {
- MIGRATE_UNMOVABLE,
-- MIGRATE_RECLAIMABLE,
- MIGRATE_MOVABLE,
-+ MIGRATE_RECLAIMABLE,
- MIGRATE_PCPTYPES, /* the number of types on the pcp lists */
- MIGRATE_RESERVE = MIGRATE_PCPTYPES,
- #ifdef CONFIG_CMA
-commit 974a786e63c96a2401a78ddba926f34c128474f1
-Author: Mel Gorman <mgorman@techsingularity.net>
-Date: Fri Nov 6 16:28:34 2015 -0800
-
- mm, page_alloc: remove MIGRATE_RESERVE
-
- MIGRATE_RESERVE preserves an old property of the buddy allocator that
- existed prior to fragmentation avoidance -- min_free_kbytes worth of pages
- tended to remain contiguous until the only alternative was to fail the
- allocation. At the time it was discovered that high-order atomic
- allocations relied on this property so MIGRATE_RESERVE was introduced. A
- later patch will introduce an alternative MIGRATE_HIGHATOMIC so this patch
- deletes MIGRATE_RESERVE and supporting code so it'll be easier to review.
- Note that this patch in isolation may look like a false regression if
- someone was bisecting high-order atomic allocation failures.
-
- Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
- Acked-by: Vlastimil Babka <vbabka@suse.cz>
- Cc: Christoph Lameter <cl@linux.com>
- Cc: David Rientjes <rientjes@google.com>
- Cc: Johannes Weiner <hannes@cmpxchg.org>
- Cc: Michal Hocko <mhocko@suse.com>
- Cc: Vitaly Wool <vitalywool@gmail.com>
- Cc: Rik van Riel <riel@redhat.com>
- Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
- Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
-diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index 1e88aae..b86cfa3 100644
---- a/include/linux/mmzone.h
-+++ b/include/linux/mmzone.h
-@@ -39,8 +39,6 @@ enum {
- MIGRATE_UNMOVABLE,
- MIGRATE_MOVABLE,
- MIGRATE_RECLAIMABLE,
-- MIGRATE_PCPTYPES, /* the number of types on the pcp lists */
-- MIGRATE_RESERVE = MIGRATE_PCPTYPES,
- #ifdef CONFIG_CMA
- /*
- * MIGRATE_CMA migration type is designed to mimic the way
-@@ -63,6 +61,8 @@ enum {
- MIGRATE_TYPES
- };
-
-+#define MIGRATE_PCPTYPES (MIGRATE_RECLAIMABLE+1)
-+
- #ifdef CONFIG_CMA
- # define is_migrate_cma(migratetype) unlikely((migratetype) == MIGRATE_CMA)
- #else
-@@ -429,12 +429,6 @@ struct zone {
-
- const char *name;
-
-- /*
-- * Number of MIGRATE_RESERVE page block. To maintain for just
-- * optimization. Protected by zone->lock.
-- */
-- int nr_migrate_reserve_block;
--
- #ifdef CONFIG_MEMORY_ISOLATION
- /*
- * Number of isolated pageblock. It is used to solve incorrect
-diff --git a/mm/huge_memory.c b/mm/huge_memory.c
-index 9812d46..dabd247 100644
---- a/mm/huge_memory.c
-+++ b/mm/huge_memory.c
-@@ -116,7 +116,7 @@ static void set_recommended_min_free_kbytes(void)
- for_each_populated_zone(zone)
- nr_zones++;
-
-- /* Make sure at least 2 hugepages are free for MIGRATE_RESERVE */
-+ /* Ensure 2 pageblocks are free to assist fragmentation avoidance */
- recommended_min = pageblock_nr_pages * nr_zones * 2;
-
- /*
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 8dc6e3c..5888126 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -817,7 +817,6 @@ static void free_pcppages_bulk(struct zone *zone, int count,
- if (unlikely(has_isolate_pageblock(zone)))
- mt = get_pageblock_migratetype(page);
-
-- /* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */
- __free_one_page(page, page_to_pfn(page), zone, 0, mt);
- trace_mm_page_pcpu_drain(page, 0, mt);
- } while (--to_free && --batch_free && !list_empty(list));
-@@ -1417,15 +1416,14 @@ struct page *__rmqueue_smallest(struct zone *zone, unsigned int order,
- * the free lists for the desirable migrate type are depleted
- */
- static int fallbacks[MIGRATE_TYPES][4] = {
-- [MIGRATE_UNMOVABLE] = { MIGRATE_RECLAIMABLE, MIGRATE_MOVABLE, MIGRATE_RESERVE },
-- [MIGRATE_RECLAIMABLE] = { MIGRATE_UNMOVABLE, MIGRATE_MOVABLE, MIGRATE_RESERVE },
-- [MIGRATE_MOVABLE] = { MIGRATE_RECLAIMABLE, MIGRATE_UNMOVABLE, MIGRATE_RESERVE },
-+ [MIGRATE_UNMOVABLE] = { MIGRATE_RECLAIMABLE, MIGRATE_MOVABLE, MIGRATE_TYPES },
-+ [MIGRATE_RECLAIMABLE] = { MIGRATE_UNMOVABLE, MIGRATE_MOVABLE, MIGRATE_TYPES },
-+ [MIGRATE_MOVABLE] = { MIGRATE_RECLAIMABLE, MIGRATE_UNMOVABLE, MIGRATE_TYPES },
- #ifdef CONFIG_CMA
-- [MIGRATE_CMA] = { MIGRATE_RESERVE }, /* Never used */
-+ [MIGRATE_CMA] = { MIGRATE_TYPES }, /* Never used */
- #endif
-- [MIGRATE_RESERVE] = { MIGRATE_RESERVE }, /* Never used */
- #ifdef CONFIG_MEMORY_ISOLATION
-- [MIGRATE_ISOLATE] = { MIGRATE_RESERVE }, /* Never used */
-+ [MIGRATE_ISOLATE] = { MIGRATE_TYPES }, /* Never used */
- #endif
- };
-
-@@ -1598,7 +1596,7 @@ int find_suitable_fallback(struct free_area *area, unsigned int order,
- *can_steal = false;
- for (i = 0;; i++) {
- fallback_mt = fallbacks[migratetype][i];
-- if (fallback_mt == MIGRATE_RESERVE)
-+ if (fallback_mt == MIGRATE_TYPES)
- break;
-
- if (list_empty(&area->free_list[fallback_mt]))
-@@ -1676,25 +1674,13 @@ static struct page *__rmqueue(struct zone *zone, unsigned int order,
- {
- struct page *page;
-
--retry_reserve:
- page = __rmqueue_smallest(zone, order, migratetype);
--
-- if (unlikely(!page) && migratetype != MIGRATE_RESERVE) {
-+ if (unlikely(!page)) {
- if (migratetype == MIGRATE_MOVABLE)
- page = __rmqueue_cma_fallback(zone, order);
-
- if (!page)
- page = __rmqueue_fallback(zone, order, migratetype);
--
-- /*
-- * Use MIGRATE_RESERVE rather than fail an allocation. goto
-- * is used because __rmqueue_smallest is an inline function
-- * and we want just one call site
-- */
-- if (!page) {
-- migratetype = MIGRATE_RESERVE;
-- goto retry_reserve;
-- }
- }
-
- trace_mm_page_alloc_zone_locked(page, order, migratetype);
-@@ -3492,7 +3478,6 @@ static void show_migration_types(unsigned char type)
- [MIGRATE_UNMOVABLE] = 'U',
- [MIGRATE_RECLAIMABLE] = 'E',
- [MIGRATE_MOVABLE] = 'M',
-- [MIGRATE_RESERVE] = 'R',
- #ifdef CONFIG_CMA
- [MIGRATE_CMA] = 'C',
- #endif
-@@ -4303,120 +4288,6 @@ static inline unsigned long wait_table_bits(unsigned long size)
- }
-
- /*
-- * Check if a pageblock contains reserved pages
-- */
--static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
--{
-- unsigned long pfn;
--
-- for (pfn = start_pfn; pfn < end_pfn; pfn++) {
-- if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
-- return 1;
-- }
-- return 0;
--}
--
--/*
-- * Mark a number of pageblocks as MIGRATE_RESERVE. The number
-- * of blocks reserved is based on min_wmark_pages(zone). The memory within
-- * the reserve will tend to store contiguous free pages. Setting min_free_kbytes
-- * higher will lead to a bigger reserve which will get freed as contiguous
-- * blocks as reclaim kicks in
-- */
--static void setup_zone_migrate_reserve(struct zone *zone)
--{
-- unsigned long start_pfn, pfn, end_pfn, block_end_pfn;
-- struct page *page;
-- unsigned long block_migratetype;
-- int reserve;
-- int old_reserve;
--
-- /*
-- * Get the start pfn, end pfn and the number of blocks to reserve
-- * We have to be careful to be aligned to pageblock_nr_pages to
-- * make sure that we always check pfn_valid for the first page in
-- * the block.
-- */
-- start_pfn = zone->zone_start_pfn;
-- end_pfn = zone_end_pfn(zone);
-- start_pfn = roundup(start_pfn, pageblock_nr_pages);
-- reserve = roundup(min_wmark_pages(zone), pageblock_nr_pages) >>
-- pageblock_order;
--
-- /*
-- * Reserve blocks are generally in place to help high-order atomic
-- * allocations that are short-lived. A min_free_kbytes value that
-- * would result in more than 2 reserve blocks for atomic allocations
-- * is assumed to be in place to help anti-fragmentation for the
-- * future allocation of hugepages at runtime.
-- */
-- reserve = min(2, reserve);
-- old_reserve = zone->nr_migrate_reserve_block;
--
-- /* When memory hot-add, we almost always need to do nothing */
-- if (reserve == old_reserve)
-- return;
-- zone->nr_migrate_reserve_block = reserve;
--
-- for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {
-- if (!early_page_nid_uninitialised(pfn, zone_to_nid(zone)))
-- return;
--
-- if (!pfn_valid(pfn))
-- continue;
-- page = pfn_to_page(pfn);
--
-- /* Watch out for overlapping nodes */
-- if (page_to_nid(page) != zone_to_nid(zone))
-- continue;
--
-- block_migratetype = get_pageblock_migratetype(page);
--
-- /* Only test what is necessary when the reserves are not met */
-- if (reserve > 0) {
-- /*
-- * Blocks with reserved pages will never free, skip
-- * them.
-- */
-- block_end_pfn = min(pfn + pageblock_nr_pages, end_pfn);
-- if (pageblock_is_reserved(pfn, block_end_pfn))
-- continue;
--
-- /* If this block is reserved, account for it */
-- if (block_migratetype == MIGRATE_RESERVE) {
-- reserve--;
-- continue;
-- }
--
-- /* Suitable for reserving if this block is movable */
-- if (block_migratetype == MIGRATE_MOVABLE) {
-- set_pageblock_migratetype(page,
-- MIGRATE_RESERVE);
-- move_freepages_block(zone, page,
-- MIGRATE_RESERVE);
-- reserve--;
-- continue;
-- }
-- } else if (!old_reserve) {
-- /*
-- * At boot time we don't need to scan the whole zone
-- * for turning off MIGRATE_RESERVE.
-- */
-- break;
-- }
--
-- /*
-- * If the reserve is met and this is a previous reserved block,
-- * take it back
-- */
-- if (block_migratetype == MIGRATE_RESERVE) {
-- set_pageblock_migratetype(page, MIGRATE_MOVABLE);
-- move_freepages_block(zone, page, MIGRATE_MOVABLE);
-- }
-- }
--}
--
--/*
- * Initially all pages are reserved - free ones are freed
- * up by free_all_bootmem() once the early boot process is
- * done. Non-atomic initialization, single-pass.
-@@ -4455,9 +4326,7 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
- * movable at startup. This will force kernel allocations
- * to reserve their blocks rather than leaking throughout
- * the address space during boot when many long-lived
-- * kernel allocations are made. Later some blocks near
-- * the start are marked MIGRATE_RESERVE by
-- * setup_zone_migrate_reserve()
-+ * kernel allocations are made.
- *
- * bitmap is created for zone's valid pfn range. but memmap
- * can be created for invalid pages (for alignment)
-@@ -6018,7 +5887,6 @@ static void __setup_per_zone_wmarks(void)
- high_wmark_pages(zone) - low_wmark_pages(zone) -
- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
-
-- setup_zone_migrate_reserve(zone);
- spin_unlock_irqrestore(&zone->lock, flags);
- }
-
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index ffcb4f5..5b289dc 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -923,7 +923,6 @@ static char * const migratetype_names[MIGRATE_TYPES] = {
- "Unmovable",
- "Reclaimable",
- "Movable",
-- "Reserve",
- #ifdef CONFIG_CMA
- "CMA",
- #endif
-diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index 8ed2ffd963c5..7340353f8aea 100644
---- a/mm/backing-dev.c
-+++ b/mm/backing-dev.c
-@@ -957,8 +957,9 @@ EXPORT_SYMBOL(congestion_wait);
- * jiffies for either a BDI to exit congestion of the given @sync queue
- * or a write to complete.
- *
-- * In the absence of zone congestion, cond_resched() is called to yield
-- * the processor if necessary but otherwise does not sleep.
-+ * In the absence of zone congestion, a short sleep or a cond_resched is
-+ * performed to yield the processor and to allow other subsystems to make
-+ * a forward progress.
- *
- * The return value is 0 if the sleep is for the full timeout. Otherwise,
- * it is the number of jiffies that were still remaining when the function
-@@ -978,7 +979,19 @@ long wait_iff_congested(struct zone *zone, int sync, long timeout)
- */
- if (atomic_read(&nr_wb_congested[sync]) == 0 ||
- !test_bit(ZONE_CONGESTED, &zone->flags)) {
-- cond_resched();
-+
-+ /*
-+ * Memory allocation/reclaim might be called from a WQ
-+ * context and the current implementation of the WQ
-+ * concurrency control doesn't recognize that a particular
-+ * WQ is congested if the worker thread is looping without
-+ * ever sleeping. Therefore we have to do a short sleep
-+ * here rather than calling cond_resched().
-+ */
-+ if (current->flags & PF_WQ_WORKER)
-+ schedule_timeout(1);
-+ else
-+ cond_resched();
-
- /* In case we scheduled, work out time remaining */
- ret = timeout - (jiffies - start);
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 45dcbcb5c594..0975da8e3432 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -1381,6 +1381,7 @@ static const struct file_operations proc_vmstat_file_operations = {
- #endif /* CONFIG_PROC_FS */
-
- #ifdef CONFIG_SMP
-+static struct workqueue_struct *vmstat_wq;
- static DEFINE_PER_CPU(struct delayed_work, vmstat_work);
- int sysctl_stat_interval __read_mostly = HZ;
- static cpumask_var_t cpu_stat_off;
-@@ -1393,7 +1394,7 @@ static void vmstat_update(struct work_struct *w)
- * to occur in the future. Keep on running the
- * update worker thread.
- */
-- schedule_delayed_work_on(smp_processor_id(),
-+ queue_delayed_work_on(smp_processor_id(), vmstat_wq,
- this_cpu_ptr(&vmstat_work),
- round_jiffies_relative(sysctl_stat_interval));
- } else {
-@@ -1462,7 +1463,7 @@ static void vmstat_shepherd(struct work_struct *w)
- if (need_update(cpu) &&
- cpumask_test_and_clear_cpu(cpu, cpu_stat_off))
-
-- schedule_delayed_work_on(cpu,
-+ queue_delayed_work_on(cpu, vmstat_wq,
- &per_cpu(vmstat_work, cpu), 0);
-
- put_online_cpus();
-@@ -1551,6 +1552,7 @@ static int __init setup_vmstat(void)
-
- start_shepherd_timer();
- cpu_notifier_register_done();
-+ vmstat_wq = alloc_workqueue("vmstat", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);
- #endif
- #ifdef CONFIG_PROC_FS
- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
---
-2.6.2
-
-From 09ccfd238e5a0e670d8178cf50180ea81ae09ae1 Mon Sep 17 00:00:00 2001
-From: WANG Cong <xiyou.wangcong@gmail.com>
-Date: Mon, 14 Dec 2015 13:48:36 -0800
-Subject: pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
-
-Reported-by: Dmitry Vyukov <dvyukov@gmail.com>
-Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ppp/pptp.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
-index fc69e41..597c53e 100644
---- a/drivers/net/ppp/pptp.c
-+++ b/drivers/net/ppp/pptp.c
-@@ -419,6 +419,9 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
- struct pptp_opt *opt = &po->proto.pptp;
- int error = 0;
-
-+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
-+ return -EINVAL;
-+
- lock_sock(sk);
-
- opt->src_addr = sp->sa_addr.pptp;
-@@ -440,6 +443,9 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
- struct flowi4 fl4;
- int error = 0;
-
-+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
-+ return -EINVAL;
-+
- if (sp->sa_protocol != PX_PROTO_PPTP)
- return -EINVAL;
-
---
-cgit v0.11.2
-
-commit cc57858831e3e9678291de730c4b4d2e52a19f59
-Author: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
-Date: Fri Dec 18 15:19:16 2015 +1100
-
- md/raid10: fix data corruption and crash during resync
-
- The commit c31df25f20e3 ("md/raid10: make sync_request_write() call
- bio_copy_data()") replaced manual data copying with bio_copy_data() but
- it doesn't work as intended. The source bio (fbio) is already processed,
- so its bvec_iter has bi_size == 0 and bi_idx == bi_vcnt. Because of
- this, bio_copy_data() either does not copy anything, or worse, copies
- data from the ->bi_next bio if it is set. This causes wrong data to be
- written to drives during resync and sometimes lockups/crashes in
- bio_copy_data():
-
- [ 517.338478] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [md126_raid10:3319]
- [ 517.347324] Modules linked in: raid10 xt_CHECKSUM ipt_MASQUERADE nf_nat_masquerade_ipv4 tun ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 ipt_REJECT nf_reject_ipv4 xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security ip6table_raw ip6table_filter ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_security iptable_raw iptable_filter ip_tables x86_pkg_temp_thermal coretemp kvm_intel kvm crct10dif_pclmul crc32_pclmul cryptd shpchp pcspkr ipmi_si ipmi_msghandler tpm_crb acpi_power_meter acpi_cpufreq ext4 mbcache jbd2 sr_mod cdrom sd_mod e1000e ax88179_178a usbnet mii ahci ata_generic crc32c_intel libahci ptp pata_acpi libata pps_core wmi sunrpc dm_mirror dm_region_hash dm_log dm_mod
- [ 517.440555] CPU: 0 PID: 3319 Comm: md126_raid10 Not tainted 4.3.0-rc6+ #1
- [ 517.448384] Hardware name: Intel Corporation PURLEY/PURLEY, BIOS PLYDCRB1.86B.0055.D14.1509221924 09/22/2015
- [ 517.459768] task: ffff880153773980 ti: ffff880150df8000 task.ti: ffff880150df8000
- [ 517.468529] RIP: 0010:[<ffffffff812e1888>] [<ffffffff812e1888>] bio_copy_data+0xc8/0x3c0
- [ 517.478164] RSP: 0018:ffff880150dfbc98 EFLAGS: 00000246
- [ 517.484341] RAX: ffff880169356688 RBX: 0000000000001000 RCX: 0000000000000000
- [ 517.492558] RDX: 0000000000000000 RSI: ffffea0001ac2980 RDI: ffffea0000d835c0
- [ 517.500773] RBP: ffff880150dfbd08 R08: 0000000000000001 R09: ffff880153773980
- [ 517.508987] R10: ffff880169356600 R11: 0000000000001000 R12: 0000000000010000
- [ 517.517199] R13: 000000000000e000 R14: 0000000000000000 R15: 0000000000001000
- [ 517.525412] FS: 0000000000000000(0000) GS:ffff880174a00000(0000) knlGS:0000000000000000
- [ 517.534844] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
- [ 517.541507] CR2: 00007f8a044d5fed CR3: 0000000169504000 CR4: 00000000001406f0
- [ 517.549722] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
- [ 517.557929] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
- [ 517.566144] Stack:
- [ 517.568626] ffff880174a16bc0 ffff880153773980 ffff880169356600 0000000000000000
- [ 517.577659] 0000000000000001 0000000000000001 ffff880153773980 ffff88016a61a800
- [ 517.586715] ffff880150dfbcf8 0000000000000001 ffff88016dd209e0 0000000000001000
- [ 517.595773] Call Trace:
- [ 517.598747] [<ffffffffa043ef95>] raid10d+0xfc5/0x1690 [raid10]
- [ 517.605610] [<ffffffff816697ae>] ? __schedule+0x29e/0x8e2
- [ 517.611987] [<ffffffff814ff206>] md_thread+0x106/0x140
- [ 517.618072] [<ffffffff810c1d80>] ? wait_woken+0x80/0x80
- [ 517.624252] [<ffffffff814ff100>] ? super_1_load+0x520/0x520
- [ 517.630817] [<ffffffff8109ef89>] kthread+0xc9/0xe0
- [ 517.636506] [<ffffffff8109eec0>] ? flush_kthread_worker+0x70/0x70
- [ 517.643653] [<ffffffff8166d99f>] ret_from_fork+0x3f/0x70
- [ 517.649929] [<ffffffff8109eec0>] ? flush_kthread_worker+0x70/0x70
-
- Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
- Reviewed-by: Shaohua Li <shli@kernel.org>
- Cc: stable@vger.kernel.org (v4.2+)
- Fixes: c31df25f20e3 ("md/raid10: make sync_request_write() call bio_copy_data()")
- Signed-off-by: NeilBrown <neilb@suse.com>
-
-diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
-index 41d70bc..84e597e 100644
---- a/drivers/md/raid10.c
-+++ b/drivers/md/raid10.c
-@@ -1946,6 +1946,8 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio)
-
- first = i;
- fbio = r10_bio->devs[i].bio;
-+ fbio->bi_iter.bi_size = r10_bio->sectors << 9;
-+ fbio->bi_iter.bi_idx = 0;
-
- vcnt = (r10_bio->sectors + (PAGE_SIZE >> 9) - 1) >> (PAGE_SHIFT - 9);
- /* now find blocks with errors */
-@@ -1989,7 +1991,7 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio)
- bio_reset(tbio);
-
- tbio->bi_vcnt = vcnt;
-- tbio->bi_iter.bi_size = r10_bio->sectors << 9;
-+ tbio->bi_iter.bi_size = fbio->bi_iter.bi_size;
- tbio->bi_rw = WRITE;
- tbio->bi_private = r10_bio;
- tbio->bi_iter.bi_sector = r10_bio->devs[i].addr;
-From: Michal Hocko <mhocko@suse.com>
-
-kernel test robot has reported the following crash:
-[ 3.870718] BUG: unable to handle kernel NULL pointer dereferenceNULL pointer dereference at 00000100
- at 00000100
-[ 3.872615] IP: [<c1074df6>] __queue_work+0x26/0x390 [<c1074df6>] __queue_work+0x26/0x390
-[ 3.873758] *pdpt = 0000000000000000 *pde = f000ff53f000ff53 *pde = f000ff53f000ff53
-[ 3.875096] Oops: 0000 [#1] PREEMPT PREEMPT SMP SMP
-[ 3.876130] CPU: 0 PID: 24 Comm: kworker/0:1 Not tainted 4.4.0-rc4-00139-g373ccbe #1
-[ 3.878135] Workqueue: events vmstat_shepherd
-[ 3.879207] task: cb684600 ti: cb7ba000 task.ti: cb7ba000
-[ 3.880445] EIP: 0060:[<c1074df6>] EFLAGS: 00010046 CPU: 0
-[ 3.881704] EIP is at __queue_work+0x26/0x390
-[ 3.882823] EAX: 00000046 EBX: cbb37800 ECX: cbb37800 EDX: 00000000
-[ 3.884457] ESI: 00000000 EDI: 00000000 EBP: cb7bbe68 ESP: cb7bbe38
-[ 3.886005] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
-[ 3.887229] CR0: 8005003b CR2: 00000100 CR3: 01fd5000 CR4: 000006b0
-[ 3.888663] Stack:
-[ 3.895204] Call Trace:
-[ 3.895854] [<c1a381dd>] ? mutex_unlock+0xd/0x10
-[ 3.897120] [<c1075221>] __queue_delayed_work+0xa1/0x160
-[ 3.898530] [<c10764c6>] queue_delayed_work_on+0x36/0x60
-[ 3.899790] [<c11494bd>] vmstat_shepherd+0xad/0xf0
-[ 3.900899] [<c1075a7a>] process_one_work+0x1aa/0x4c0
-[ 3.902093] [<c10759e2>] ? process_one_work+0x112/0x4c0
-[ 3.903520] [<c10ac31e>] ? do_raw_spin_lock+0xe/0x150
-[ 3.904853] [<c1075dd1>] worker_thread+0x41/0x440
-[ 3.906023] [<c1075d90>] ? process_one_work+0x4c0/0x4c0
-[ 3.907242] [<c107b7c0>] kthread+0xb0/0xd0
-[ 3.908188] [<c1a3c651>] ret_from_kernel_thread+0x21/0x40
-[ 3.909601] [<c107b710>] ? __kthread_parkme+0x80/0x80
-
-The reason is that start_shepherd_timer schedules the shepherd work item
-which uses vmstat_wq (vmstat_shepherd) before setup_vmstat allocates
-that workqueue so if the further initialization takes more than HZ
-we might end up scheduling on a NULL vmstat_wq. This is really unlikely
-but not impossible.
-
-Fixes: 373ccbe59270 ("mm, vmstat: allow WQ concurrency to discover memory reclaim doesn't make any progress")
-Reported-by: kernel test robot <ying.huang@linux.intel.com>
-Signed-off-by: Michal Hocko <mhocko@suse.com>
----
-Hi Linus,
-I am not marking this for stable because I hope we can sneak it into 4.4.
-The patch is trivial and obvious. I am sorry about the breakage. If you prefer
-to postpone it to 4.5-rc1 because this is not really that critical and shouldn't
-happen most of the time then I will repost with stable tag added.
-
-Thanks!
-
- mm/vmstat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 4ebc17d948cb..c54fd2924f25 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -1483,6 +1483,7 @@ static void __init start_shepherd_timer(void)
- BUG();
- cpumask_copy(cpu_stat_off, cpu_online_mask);
-
-+ vmstat_wq = alloc_workqueue("vmstat", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);
- schedule_delayed_work(&shepherd,
- round_jiffies_relative(sysctl_stat_interval));
- }
-@@ -1550,7 +1551,6 @@ static int __init setup_vmstat(void)
-
- start_shepherd_timer();
- cpu_notifier_register_done();
-- vmstat_wq = alloc_workqueue("vmstat", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);
- #endif
- #ifdef CONFIG_PROC_FS
- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
---
-2.6.4
-
From: Dave Chinner <dchinner@redhat.com>
When we do inode readahead in log recovery, we do can do the
+ if (!(flags & XBF_READ))
+ xfs_buf_ioerror(bp, 0);
+
- XFS_STATS_INC(xb_get);
+ XFS_STATS_INC(target->bt_mount, xb_get);
trace_xfs_buf_get(bp, flags, _RET_IP_);
return bp;
--
projects / packages / kernel.git / commitdiff