diff --git a/talimatname/genel/k/kernel/aufs4-base.patch b/talimatname/genel/k/kernel/aufs4-base.patch index 64e05c4f8..4ca77f2ce 100644 --- a/talimatname/genel/k/kernel/aufs4-base.patch +++ b/talimatname/genel/k/kernel/aufs4-base.patch @@ -1,11 +1,11 @@ SPDX-License-Identifier: GPL-2.0 -aufs4.17 base patch +aufs4.18 base patch diff --git a/MAINTAINERS b/MAINTAINERS -index 9c125f7..4616bbf 100644 +index 544cac8..aaa1c7a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2519,6 +2519,19 @@ F: include/linux/audit.h +@@ -2541,6 +2541,19 @@ F: include/linux/audit.h F: include/uapi/linux/audit.h F: kernel/audit* @@ -24,13 +24,13 @@ index 9c125f7..4616bbf 100644 + AUXILIARY DISPLAY DRIVERS M: Miguel Ojeda Sandonis - W: http://miguelojeda.es/auxdisplay.htm + S: Maintained diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index 55cf554..bc965e5 100644 +index 4cb1d1b..5678bf8 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c -@@ -713,6 +713,24 @@ static inline int is_loop_device(struct file *file) - return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR; +@@ -741,6 +741,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, + return error; } +/* @@ -55,20 +55,20 @@ index 55cf554..bc965e5 100644 static ssize_t loop_attr_show(struct device *dev, char *page, diff --git a/fs/dcache.c b/fs/dcache.c -index 2acfc69..ff338e2 100644 +index ceb7b49..88a1514 100644 --- a/fs/dcache.c +++ b/fs/dcache.c -@@ -1234,7 +1234,7 @@ enum d_walk_ret { +@@ -1237,7 +1237,7 @@ enum d_walk_ret { * - * The @enter() and @finish() callbacks are called with d_lock held. + * The @enter() callbacks are called with d_lock held. */ -static void d_walk(struct dentry *parent, void *data, +void d_walk(struct dentry *parent, void *data, - enum d_walk_ret (*enter)(void *, struct dentry *), - void (*finish)(void *)) + enum d_walk_ret (*enter)(void *, struct dentry *)) { + struct dentry *this_parent; diff --git a/fs/fcntl.c b/fs/fcntl.c -index d737ff0..7550799 100644 +index 12273b6..545e686 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -32,7 +32,7 @@ @@ -90,23 +90,23 @@ index d737ff0..7550799 100644 return error; diff --git a/fs/inode.c b/fs/inode.c -index 3b55391..e0c5255 100644 +index 8c86c80..af894e7 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -1663,7 +1663,7 @@ EXPORT_SYMBOL(generic_update_time); +@@ -1649,7 +1649,7 @@ EXPORT_SYMBOL(generic_update_time); * This does the actual work of updating an inodes time or version. Must have * had called mnt_want_write() before calling this. */ --static int update_time(struct inode *inode, struct timespec *time, int flags) -+int update_time(struct inode *inode, struct timespec *time, int flags) +-static int update_time(struct inode *inode, struct timespec64 *time, int flags) ++int update_time(struct inode *inode, struct timespec64 *time, int flags) { - int (*update_time)(struct inode *, struct timespec *, int); + int (*update_time)(struct inode *, struct timespec64 *, int); diff --git a/fs/namespace.c b/fs/namespace.c -index 5f75969..61129ff 100644 +index bd2f4c6..eb7cd21 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -846,6 +846,12 @@ static inline int check_mnt(struct mount *mnt) +@@ -855,6 +855,12 @@ static inline int check_mnt(struct mount *mnt) return mnt->mnt_ns == current->nsproxy->mnt_ns; } @@ -120,7 +120,7 @@ index 5f75969..61129ff 100644 * vfsmount lock must be held for write */ diff --git a/fs/read_write.c b/fs/read_write.c -index c4eabbf..ddd6e67 100644 +index 153f8f6..ccc5bc8 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count, @@ -153,10 +153,10 @@ index c4eabbf..ddd6e67 100644 { mm_segment_t old_fs; diff --git a/fs/splice.c b/fs/splice.c -index 005d09c..f617ab0 100644 +index b3daa97..1dd7f96 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); +@@ -838,8 +838,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ @@ -167,7 +167,7 @@ index 005d09c..f617ab0 100644 { ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); -@@ -854,9 +854,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +@@ -855,9 +855,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. */ @@ -206,10 +206,10 @@ index 279720d..76e38ea 100644 static inline void fput_light(struct file *file, int fput_needed) { diff --git a/include/linux/fs.h b/include/linux/fs.h -index 760d8da..09a2542 100644 +index 805bf22..0d0d247f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1270,6 +1270,7 @@ extern void fasync_free(struct fasync_struct *); +@@ -1273,6 +1273,7 @@ extern void fasync_free(struct fasync_struct *); /* can be called from interrupts */ extern void kill_fasync(struct fasync_struct **, int, int); @@ -217,7 +217,7 @@ index 760d8da..09a2542 100644 extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); extern int f_setown(struct file *filp, unsigned long arg, int force); extern void f_delown(struct file *filp); -@@ -1724,6 +1725,7 @@ struct file_operations { +@@ -1733,6 +1734,7 @@ struct file_operations { ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); int (*check_flags)(int); @@ -225,7 +225,7 @@ index 760d8da..09a2542 100644 int (*flock) (struct file *, int, struct file_lock *); ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); -@@ -1794,6 +1796,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, +@@ -1803,6 +1805,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, struct iovec *fast_pointer, struct iovec **ret_pointer); @@ -238,15 +238,15 @@ index 760d8da..09a2542 100644 extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); -@@ -2199,6 +2207,7 @@ extern int current_umask(void); +@@ -2218,6 +2226,7 @@ extern int current_umask(void); extern void ihold(struct inode * inode); extern void iput(struct inode *); - extern int generic_update_time(struct inode *, struct timespec *, int); -+extern int update_time(struct inode *, struct timespec *, int); + extern int generic_update_time(struct inode *, struct timespec64 *, int); ++extern int update_time(struct inode *, struct timespec64 *, int); /* /sys/fs */ extern struct kobject *fs_kobj; -@@ -2485,6 +2494,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) +@@ -2505,6 +2514,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) return false; } #endif @@ -310,7 +310,7 @@ index 74b4911..19789fb 100644 + unsigned int flags); #endif diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index 0233863..06e0d7a 100644 +index 5fa4d31..720f070 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES]; diff --git a/talimatname/genel/k/kernel/aufs4-kbuild.patch b/talimatname/genel/k/kernel/aufs4-kbuild.patch index 5fcdc1076..2c712af60 100644 --- a/talimatname/genel/k/kernel/aufs4-kbuild.patch +++ b/talimatname/genel/k/kernel/aufs4-kbuild.patch @@ -1,11 +1,11 @@ SPDX-License-Identifier: GPL-2.0 -aufs4.17 kbuild patch +aufs4.18 kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig -index bc821a8..7ae814c 100644 +index ac474a6..284cee9 100644 --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -251,6 +251,7 @@ source "fs/pstore/Kconfig" +@@ -255,6 +255,7 @@ source "fs/pstore/Kconfig" source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/exofs/Kconfig" @@ -14,7 +14,7 @@ index bc821a8..7ae814c 100644 endif # MISC_FILESYSTEMS diff --git a/fs/Makefile b/fs/Makefile -index c9375fd..8af5671 100644 +index 293733f..12d19d0 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -128,3 +128,4 @@ obj-y += exofs/ # Multiple modules diff --git a/talimatname/genel/k/kernel/aufs4-loopback.patch b/talimatname/genel/k/kernel/aufs4-loopback.patch index 4837ccac4..1a2a84402 100644 --- a/talimatname/genel/k/kernel/aufs4-loopback.patch +++ b/talimatname/genel/k/kernel/aufs4-loopback.patch @@ -1,5 +1,5 @@ SPDX-License-Identifier: GPL-2.0 -aufs4.17 loopback patch +aufs4.18 loopback patch diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 5678bf8..ec9c4fb 100644 @@ -153,7 +153,7 @@ index 4d42c7a..a4974ee 100644 void *key_data; diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c -index 7ca7f67..3d4e90d 100644 +index 937a20d..1355656 100644 --- a/fs/aufs/f_op.c +++ b/fs/aufs/f_op.c @@ -358,7 +358,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter) @@ -166,7 +166,7 @@ index 7ca7f67..3d4e90d 100644 if (file->f_mapping != h_file->f_mapping) { file->f_mapping = h_file->f_mapping; diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c -index 2d65b8f..5ed7903 100644 +index 3d84349..a642de5 100644 --- a/fs/aufs/loop.c +++ b/fs/aufs/loop.c @@ -133,3 +133,19 @@ void au_loopback_fin(void) @@ -215,7 +215,7 @@ index 05d703d..6bb23c8 100644 #endif /* __KERNEL__ */ diff --git a/fs/aufs/super.c b/fs/aufs/super.c -index eed37ba..a3a5cd7 100644 +index 4020639..13e315f 100644 --- a/fs/aufs/super.c +++ b/fs/aufs/super.c @@ -840,7 +840,10 @@ static const struct super_operations aufs_sop = { @@ -231,7 +231,7 @@ index eed37ba..a3a5cd7 100644 /* ---------------------------------------------------------------------- */ diff --git a/include/linux/fs.h b/include/linux/fs.h -index 3a9d5b4..50a30c2 100644 +index 0d0d247f..50d77f8 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1861,6 +1861,10 @@ struct super_operations { diff --git a/talimatname/genel/k/kernel/aufs4-mmap.patch b/talimatname/genel/k/kernel/aufs4-mmap.patch index 6ab364ff0..141436d73 100644 --- a/talimatname/genel/k/kernel/aufs4-mmap.patch +++ b/talimatname/genel/k/kernel/aufs4-mmap.patch @@ -1,11 +1,11 @@ SPDX-License-Identifier: GPL-2.0 -aufs4.17 mmap patch +aufs4.18 mmap patch diff --git a/fs/proc/base.c b/fs/proc/base.c -index 1a76d75..77f698e 100644 +index aaffc0c..ab72941 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c -@@ -2024,7 +2024,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) +@@ -2004,7 +2004,7 @@ static int 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) { @@ -15,7 +15,7 @@ index 1a76d75..77f698e 100644 rc = 0; } diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c -index 7563437..7c0dc0f 100644 +index 3b63be6..fb9913b 100644 --- a/fs/proc/nommu.c +++ b/fs/proc/nommu.c @@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) @@ -31,10 +31,10 @@ index 7563437..7c0dc0f 100644 ino = inode->i_ino; } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index c486ad4..76b71f8 100644 +index dfd73a4..ed2ce10 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c -@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) +@@ -306,7 +306,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) const char *name = NULL; if (file) { @@ -46,7 +46,7 @@ index c486ad4..76b71f8 100644 dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; -@@ -1726,7 +1729,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) +@@ -1734,7 +1737,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; @@ -72,10 +72,10 @@ index 5b62f57..dfb4a3b 100644 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 02a616e..01b3bb9 100644 +index 68a5121..d7dd986 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1380,6 +1380,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, +@@ -1448,6 +1448,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, unmap_mapping_range(mapping, holebegin, holelen, 0); } @@ -105,10 +105,10 @@ index 02a616e..01b3bb9 100644 void *buf, int len, unsigned int gup_flags); extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index 2161234..78aa367 100644 +index 99ce070..8babe35 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h -@@ -251,6 +251,7 @@ struct vm_region { +@@ -236,6 +236,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 */ @@ -116,7 +116,7 @@ index 2161234..78aa367 100644 int vm_usage; /* region usage count (access under nommu_region_sem) */ bool vm_icache_flushed : 1; /* true if the icache has been flushed for -@@ -325,6 +326,7 @@ struct vm_area_struct { +@@ -310,6 +311,7 @@ struct vm_area_struct { unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE units */ struct file * vm_file; /* File we map to (can be NULL). */ @@ -125,10 +125,10 @@ index 2161234..78aa367 100644 atomic_long_t swap_readahead_info; diff --git a/kernel/fork.c b/kernel/fork.c -index a5d21c4..e965e09 100644 +index 1b27bab..382f45d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -473,7 +473,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, +@@ -504,7 +504,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, struct inode *inode = file_inode(file); struct address_space *mapping = file->f_mapping; @@ -138,7 +138,7 @@ index a5d21c4..e965e09 100644 atomic_dec(&inode->i_writecount); i_mmap_lock_write(mapping); diff --git a/mm/Makefile b/mm/Makefile -index b4e54a9a..77892ae 100644 +index 8716bda..68afd6d 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o \ @@ -151,11 +151,11 @@ index b4e54a9a..77892ae 100644 obj-y += init-mm.o diff --git a/mm/filemap.c b/mm/filemap.c -index 0604cb0..45d2369 100644 +index 52517f2..250f675 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -2700,7 +2700,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf) - int ret = VM_FAULT_LOCKED; +@@ -2700,7 +2700,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) + vm_fault_t ret = VM_FAULT_LOCKED; sb_start_pagefault(inode->i_sb); - file_update_time(vmf->vma->vm_file); @@ -164,7 +164,7 @@ index 0604cb0..45d2369 100644 if (page->mapping != inode->i_mapping) { unlock_page(page); diff --git a/mm/mmap.c b/mm/mmap.c -index fc41c05..e376869 100644 +index 17bbf4d..a31c3e1 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) @@ -174,7 +174,7 @@ index fc41c05..e376869 100644 - fput(vma->vm_file); + vma_fput(vma); mpol_put(vma_policy(vma)); - kmem_cache_free(vm_area_cachep, vma); + vm_area_free(vma); return next; @@ -905,7 +905,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, if (remove_next) { @@ -195,7 +195,7 @@ index fc41c05..e376869 100644 /* Undo any partial mapping done by a device driver. */ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); -@@ -2645,7 +2645,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2640,7 +2640,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, goto out_free_mpol; if (new->vm_file) @@ -204,7 +204,7 @@ index fc41c05..e376869 100644 if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); -@@ -2664,7 +2664,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2659,7 +2659,7 @@ 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) @@ -213,16 +213,16 @@ index fc41c05..e376869 100644 unlink_anon_vmas(new); out_free_mpol: mpol_put(vma_policy(new)); -@@ -2826,7 +2826,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2821,7 +2821,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, struct vm_area_struct *vma; unsigned long populate = 0; unsigned long ret = -EINVAL; - struct file *file; + struct file *file, *prfile; - pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n", + pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n", current->comm, current->pid); -@@ -2901,10 +2901,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2896,10 +2896,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, } } @@ -251,7 +251,7 @@ index fc41c05..e376869 100644 out: up_write(&mm->mmap_sem); if (populate) -@@ -3220,7 +3237,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -3207,7 +3224,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) @@ -261,7 +261,7 @@ index fc41c05..e376869 100644 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 1372373..6362dde 100644 +index 9fc9e43..25d4c49 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm_region *region) @@ -280,9 +280,9 @@ index 1372373..6362dde 100644 - fput(vma->vm_file); + vma_fput(vma); put_nommu_region(vma->vm_region); - kmem_cache_free(vm_area_cachep, vma); + vm_area_free(vma); } -@@ -1289,7 +1289,7 @@ unsigned long do_mmap(struct file *file, +@@ -1290,7 +1290,7 @@ unsigned long do_mmap(struct file *file, goto error_just_free; } } @@ -291,7 +291,7 @@ index 1372373..6362dde 100644 kmem_cache_free(vm_region_jar, region); region = pregion; result = start; -@@ -1364,10 +1364,10 @@ unsigned long do_mmap(struct file *file, +@@ -1365,7 +1365,7 @@ unsigned long do_mmap(struct file *file, up_write(&nommu_region_sem); error: if (region->vm_file) @@ -299,11 +299,7 @@ index 1372373..6362dde 100644 + vmr_fput(region); kmem_cache_free(vm_region_jar, region); if (vma->vm_file) -- fput(vma->vm_file); -+ vma_fput(vma); - kmem_cache_free(vm_area_cachep, vma); - return ret; - + fput(vma->vm_file); diff --git a/mm/prfile.c b/mm/prfile.c new file mode 100644 index 0000000..a27ac36 diff --git a/talimatname/genel/k/kernel/aufs4-standalone.patch b/talimatname/genel/k/kernel/aufs4-standalone.patch index 9a3d2f3d0..190f09bf4 100644 --- a/talimatname/genel/k/kernel/aufs4-standalone.patch +++ b/talimatname/genel/k/kernel/aufs4-standalone.patch @@ -1,8 +1,8 @@ SPDX-License-Identifier: GPL-2.0 -aufs4.17 standalone patch +aufs4.18 standalone patch diff --git a/fs/dcache.c b/fs/dcache.c -index ff338e2..3e2bae8 100644 +index 88a1514..e3f500a 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1342,6 +1342,7 @@ void d_walk(struct dentry *parent, void *data, @@ -13,7 +13,7 @@ index ff338e2..3e2bae8 100644 struct check_mount { struct vfsmount *mnt; -@@ -2942,6 +2943,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) +@@ -2890,6 +2891,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) write_sequnlock(&rename_lock); } @@ -22,7 +22,7 @@ index ff338e2..3e2bae8 100644 /** * d_ancestor - search for an ancestor diff --git a/fs/exec.c b/fs/exec.c -index 183059c..35adee4 100644 +index bdd0eac..edd3405 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path) @@ -34,7 +34,7 @@ index 183059c..35adee4 100644 #ifdef CONFIG_USELIB /* diff --git a/fs/fcntl.c b/fs/fcntl.c -index 7550799..d403576 100644 +index 545e686..0237ad7 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg) @@ -82,10 +82,10 @@ index 7ec0b3e..819ee07 100644 void __init files_init(void) { diff --git a/fs/inode.c b/fs/inode.c -index e0c5255..ff36056 100644 +index af894e7..169811b 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -1672,6 +1672,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags) +@@ -1658,6 +1658,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags) return update_time(inode, time, flags); } @@ -94,7 +94,7 @@ index e0c5255..ff36056 100644 /** * touch_atime - update the access time diff --git a/fs/namespace.c b/fs/namespace.c -index 61129ff..5d3e0382 100644 +index eb7cd21..c536458 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -105,7 +105,7 @@ index 61129ff..5d3e0382 100644 /** * mnt_drop_write - give up write access to a mount -@@ -851,6 +852,7 @@ int is_current_mnt_ns(struct vfsmount *mnt) +@@ -860,6 +861,7 @@ int is_current_mnt_ns(struct vfsmount *mnt) { return check_mnt(real_mount(mnt)); } @@ -113,7 +113,7 @@ index 61129ff..5d3e0382 100644 /* * vfsmount lock must be held for write -@@ -1893,6 +1895,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, +@@ -1917,6 +1919,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, } return 0; } @@ -122,7 +122,7 @@ index 61129ff..5d3e0382 100644 static void cleanup_group_ids(struct mount *mnt, struct mount *end) { diff --git a/fs/notify/group.c b/fs/notify/group.c -index b7a4b6a..5a69d60 100644 +index aa5468f2..b38d224 100644 --- a/fs/notify/group.c +++ b/fs/notify/group.c @@ -22,6 +22,7 @@ @@ -158,18 +158,18 @@ index b7a4b6a..5a69d60 100644 int fsnotify_fasync(int fd, struct file *file, int on) { diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index e9191b4..1f8ccfa 100644 +index 61f4c5f..855c655 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c -@@ -108,6 +108,7 @@ void fsnotify_get_mark(struct fsnotify_mark *mark) - WARN_ON_ONCE(!refcount_read(&mark->refcnt)); - refcount_inc(&mark->refcnt); +@@ -245,6 +245,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) + queue_delayed_work(system_unbound_wq, &reaper_work, + FSNOTIFY_REAPER_DELAY); } +EXPORT_SYMBOL_GPL(fsnotify_put_mark); - static void __fsnotify_recalc_mask(struct fsnotify_mark_connector *conn) - { -@@ -392,6 +393,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark, + /* + * Get mark reference when we found the mark via lockless traversal of object +@@ -399,6 +400,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark, mutex_unlock(&group->mark_mutex); fsnotify_free_mark(mark); } @@ -177,15 +177,15 @@ index e9191b4..1f8ccfa 100644 /* * Sorting function for lists of fsnotify marks. -@@ -606,6 +608,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark, struct inode *inode, - fsnotify_put_mark(mark); +@@ -624,6 +626,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode, + mutex_unlock(&group->mark_mutex); return ret; } +EXPORT_SYMBOL_GPL(fsnotify_add_mark); - int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode, - struct vfsmount *mnt, int allow_dups) -@@ -741,6 +744,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, + /* + * Given a list of marks, find the mark associated with given group. If found +@@ -747,6 +750,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, fsnotify_get_group(group); mark->group = group; } @@ -214,7 +214,7 @@ index d0e955b..527bc1a 100644 int open_check_o_direct(struct file *f) { diff --git a/fs/read_write.c b/fs/read_write.c -index ddd6e67..aabf92d 100644 +index ccc5bc8..36f52f4 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) @@ -250,10 +250,10 @@ index ddd6e67..aabf92d 100644 static inline loff_t file_pos_read(struct file *file) { diff --git a/fs/splice.c b/fs/splice.c -index f617ab0..ec0ad02 100644 +index 1dd7f96..a5e3bcb 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -850,6 +850,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +@@ -851,6 +851,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return splice_write(pipe, out, ppos, len, flags); } @@ -261,7 +261,7 @@ index f617ab0..ec0ad02 100644 /* * Attempt to initiate a splice from a file to a pipe. -@@ -879,6 +880,7 @@ long do_splice_to(struct file *in, loff_t *ppos, +@@ -880,6 +881,7 @@ long do_splice_to(struct file *in, loff_t *ppos, return splice_read(in, ppos, pipe, len, flags); } @@ -282,10 +282,10 @@ index 2860782..ffd7ea4 100644 /* * Write out and wait upon all dirty data associated with this diff --git a/fs/xattr.c b/fs/xattr.c -index 61cd28b..35570cd 100644 +index f9cb1db..000b62b 100644 --- a/fs/xattr.c +++ b/fs/xattr.c -@@ -297,6 +297,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value, +@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value, *xattr_value = value; return error; } @@ -294,7 +294,7 @@ index 61cd28b..35570cd 100644 ssize_t __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index 06e0d7a..6af91bd 100644 +index 720f070..4f58215 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) @@ -315,10 +315,10 @@ index 0fef395..83fb1ec 100644 } +EXPORT_SYMBOL_GPL(task_work_run); diff --git a/security/commoncap.c b/security/commoncap.c -index 1ce701f..a0d106e 100644 +index f4c33ab..70563f1 100644 --- a/security/commoncap.c +++ b/security/commoncap.c -@@ -1332,12 +1332,14 @@ int cap_mmap_addr(unsigned long addr) +@@ -1336,12 +1336,14 @@ int cap_mmap_addr(unsigned long addr) } return ret; } @@ -334,7 +334,7 @@ index 1ce701f..a0d106e 100644 #ifdef CONFIG_SECURITY diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index c65b39b..e363d22 100644 +index cd97929..424fd23 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -8,6 +8,7 @@ @@ -351,7 +351,7 @@ index c65b39b..e363d22 100644 } +EXPORT_SYMBOL_GPL(__devcgroup_check_permission); diff --git a/security/security.c b/security/security.c -index 7bc2fde..6bd0468 100644 +index 68f46d8..3bc1348 100644 --- a/security/security.c +++ b/security/security.c @@ -537,6 +537,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) diff --git a/talimatname/genel/k/kernel/aufs4.patch b/talimatname/genel/k/kernel/aufs4.patch index 032647554..7166abb5c 100644 --- a/talimatname/genel/k/kernel/aufs4.patch +++ b/talimatname/genel/k/kernel/aufs4.patch @@ -1,6 +1,6 @@ -diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-4.17/Documentation/ABI/testing/debugfs-aufs +diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-4.18/Documentation/ABI/testing/debugfs-aufs --- /dev/null -+++ linux-4.17/Documentation/ABI/testing/debugfs-aufs 2018-07-25 15:11:05.122257770 +0200 ++++ linux-4.18/Documentation/ABI/testing/debugfs-aufs 2018-08-22 21:21:36.816305428 +0200 @@ -0,0 +1,55 @@ +What: /debug/aufs/si_/ +Date: March 2009 @@ -57,9 +57,9 @@ diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-4.17/Documentation/ + be created. + When the aufs mount option 'noxino' is specified, it + will be empty. About XINO files, see the aufs manual. -diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-4.17/Documentation/ABI/testing/sysfs-aufs +diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-4.18/Documentation/ABI/testing/sysfs-aufs --- /dev/null -+++ linux-4.17/Documentation/ABI/testing/sysfs-aufs 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/ABI/testing/sysfs-aufs 2018-08-22 21:21:36.816305428 +0200 @@ -0,0 +1,31 @@ +What: /sys/fs/aufs/si_/ +Date: March 2009 @@ -92,9 +92,9 @@ diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-4.17/Documentation/AB + even if it is the default path. + When the aufs mount option 'noxino' is specified, it + will be empty. About XINO files, see the aufs manual. -diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-4.17/Documentation/filesystems/aufs/design/01intro.txt +diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-4.18/Documentation/filesystems/aufs/design/01intro.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/01intro.txt 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/01intro.txt 2018-08-22 21:21:36.816305428 +0200 @@ -0,0 +1,171 @@ + +# Copyright (C) 2005-2018 Junjiro R. Okajima @@ -267,9 +267,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-4.17/Doc +Some people may think it is better to pass such work to user space +helper, instead of doing in kernel space. Actually I am still thinking +about it. But currently I have implemented it in kernel space. -diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-4.17/Documentation/filesystems/aufs/design/02struct.txt +diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-4.18/Documentation/filesystems/aufs/design/02struct.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/02struct.txt 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/02struct.txt 2018-08-22 21:21:36.816305428 +0200 @@ -0,0 +1,258 @@ + +# Copyright (C) 2005-2018 Junjiro R. Okajima @@ -529,9 +529,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-4.17/Do +- etc. + +For this purpose, use "aumvdown" command in aufs-util.git. -diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-4.17/Documentation/filesystems/aufs/design/03atomic_open.txt +diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-4.18/Documentation/filesystems/aufs/design/03atomic_open.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/03atomic_open.txt 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/03atomic_open.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,85 @@ + +# Copyright (C) 2015-2018 Junjiro R. Okajima @@ -618,9 +618,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-4. + ->atomic_open() are lost. in the ordinary case, the checks are + done by VFS:do_last(), lookup_open() and atomic_open(). some can + be implemented in aufs, but not all I am afraid. -diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-4.17/Documentation/filesystems/aufs/design/03lookup.txt +diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-4.18/Documentation/filesystems/aufs/design/03lookup.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/03lookup.txt 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/03lookup.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,113 @@ + +# Copyright (C) 2005-2018 Junjiro R. Okajima @@ -735,9 +735,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-4.17/Do + test, and skip the revalidation in step 4. It is useful and improves + aufs performance when system surely hide the aufs branches from user, + by over-mounting something (or another method). -diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-4.17/Documentation/filesystems/aufs/design/04branch.txt +diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-4.18/Documentation/filesystems/aufs/design/04branch.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/04branch.txt 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/04branch.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,74 @@ + +# Copyright (C) 2005-2018 Junjiro R. Okajima @@ -813,9 +813,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-4.17/Do + - a file on the branch is mmap-ed. + - a regular file on the branch is opened for write and there is no + same named entry on the upper branch. -diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-4.17/Documentation/filesystems/aufs/design/05wbr_policy.txt +diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-4.18/Documentation/filesystems/aufs/design/05wbr_policy.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/05wbr_policy.txt 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/05wbr_policy.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,64 @@ + +# Copyright (C) 2005-2018 Junjiro R. Okajima @@ -881,9 +881,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-4.1 + where the source and the target exists and selects the higher + one. If the selected branch is readonly, then aufs follows the + copyup policy. -diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-4.17/Documentation/filesystems/aufs/design/06dirren.dot +diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-4.18/Documentation/filesystems/aufs/design/06dirren.dot --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/06dirren.dot 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/06dirren.dot 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,31 @@ + +// to view this graph, run dot(1) command in GRAPHVIZ. @@ -916,9 +916,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-4.17/Do + +aufs_lookup -> whinfo [label="load/remove"]; +} -diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-4.17/Documentation/filesystems/aufs/design/06dirren.txt +diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-4.18/Documentation/filesystems/aufs/design/06dirren.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/06dirren.txt 2018-07-25 15:11:05.124257647 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/06dirren.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,102 @@ + +# Copyright (C) 2017-2018 Junjiro R. Okajima @@ -1022,9 +1022,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-4.17/Do +contains two names, before- and after-rename, the name comparision in +UDBA handler may not work correctly. In this case, the behaviour will be +equivalen to udba=reval case. -diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-4.17/Documentation/filesystems/aufs/design/06fhsm.txt +diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-4.18/Documentation/filesystems/aufs/design/06fhsm.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/06fhsm.txt 2018-07-25 15:11:05.124257647 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/06fhsm.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,120 @@ + +# Copyright (C) 2011-2018 Junjiro R. Okajima @@ -1146,9 +1146,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-4.17/Docu + +And of course, in every step, an error may happen. So the operation +should restore the original file state after an error happens. -diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-4.17/Documentation/filesystems/aufs/design/06mmap.txt +diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-4.18/Documentation/filesystems/aufs/design/06mmap.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/06mmap.txt 2018-07-25 15:11:05.124257647 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/06mmap.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,72 @@ + +# Copyright (C) 2005-2018 Junjiro R. Okajima @@ -1222,9 +1222,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-4.17/Docu + equivalent to vm_prfile described above. + +I have to give up this "looks-smater" approach. -diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-4.17/Documentation/filesystems/aufs/design/06xattr.txt +diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-4.18/Documentation/filesystems/aufs/design/06xattr.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/06xattr.txt 2018-07-25 15:11:05.124257647 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/06xattr.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,96 @@ + +# Copyright (C) 2014-2018 Junjiro R. Okajima @@ -1322,9 +1322,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-4.17/Doc +Some contradiction may happen I am afraid. +Do we need another attribute to stop copying XATTR? I am unsure. For +now, aufs implements the branch attributes to ignore the error. -diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-4.17/Documentation/filesystems/aufs/design/07export.txt +diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-4.18/Documentation/filesystems/aufs/design/07export.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/07export.txt 2018-07-25 15:11:05.124257647 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/07export.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,58 @@ + +# Copyright (C) 2005-2018 Junjiro R. Okajima @@ -1384,9 +1384,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-4.17/Do + convert it into ESTALE for NFSD. +- readdir(): call lockdep_on/off() because filldir in NFSD calls + lookup_one_len(), vfs_getattr(), encode_fh() and others. -diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-4.17/Documentation/filesystems/aufs/design/08shwh.txt +diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-4.18/Documentation/filesystems/aufs/design/08shwh.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/08shwh.txt 2018-07-25 15:11:05.124257647 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/08shwh.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,52 @@ + +# Copyright (C) 2005-2018 Junjiro R. Okajima @@ -1440,9 +1440,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-4.17/Docu + +This new squashfs archive can be stored on the boot device and the +initramfs will use it to replace the old one at the next boot. -diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-4.17/Documentation/filesystems/aufs/design/10dynop.txt +diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-4.18/Documentation/filesystems/aufs/design/10dynop.txt --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/design/10dynop.txt 2018-07-25 15:11:05.124257647 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/design/10dynop.txt 2018-08-22 21:21:36.817305406 +0200 @@ -0,0 +1,47 @@ + +# Copyright (C) 2010-2018 Junjiro R. Okajima @@ -1491,9 +1491,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-4.17/Doc +XIP (DAX) mainly. +Currently this approach is applied to address_space_operations for +regular files only. -diff -Naur null/Documentation/filesystems/aufs/README linux-4.17/Documentation/filesystems/aufs/README +diff -Naur null/Documentation/filesystems/aufs/README linux-4.18/Documentation/filesystems/aufs/README --- /dev/null -+++ linux-4.17/Documentation/filesystems/aufs/README 2018-07-25 15:11:05.123257708 +0200 ++++ linux-4.18/Documentation/filesystems/aufs/README 2018-08-22 21:21:36.816305428 +0200 @@ -0,0 +1,393 @@ + +Aufs4 -- advanced multi layered unification filesystem version 4.x @@ -1888,9 +1888,9 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-4.17/Documentation/f +# Local variables: ; +# mode: text; +# End: ; -diff -Naur null/fs/aufs/aufs.h linux-4.17/fs/aufs/aufs.h +diff -Naur null/fs/aufs/aufs.h linux-4.18/fs/aufs/aufs.h --- /dev/null -+++ linux-4.17/fs/aufs/aufs.h 2018-07-25 15:11:05.125257586 +0200 ++++ linux-4.18/fs/aufs/aufs.h 2018-08-22 21:21:36.818305384 +0200 @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -1953,9 +1953,9 @@ diff -Naur null/fs/aufs/aufs.h linux-4.17/fs/aufs/aufs.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_H__ */ -diff -Naur null/fs/aufs/branch.c linux-4.17/fs/aufs/branch.c +diff -Naur null/fs/aufs/branch.c linux-4.18/fs/aufs/branch.c --- /dev/null -+++ linux-4.17/fs/aufs/branch.c 2018-07-25 15:11:05.126257525 +0200 ++++ linux-4.18/fs/aufs/branch.c 2018-08-22 21:21:36.818305384 +0200 @@ -0,0 +1,1422 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -3379,9 +3379,9 @@ diff -Naur null/fs/aufs/branch.c linux-4.17/fs/aufs/branch.c + + return err; +} -diff -Naur null/fs/aufs/branch.h linux-4.17/fs/aufs/branch.h +diff -Naur null/fs/aufs/branch.h linux-4.18/fs/aufs/branch.h --- /dev/null -+++ linux-4.17/fs/aufs/branch.h 2018-07-25 15:11:05.126257525 +0200 ++++ linux-4.18/fs/aufs/branch.h 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,374 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -3757,9 +3757,9 @@ diff -Naur null/fs/aufs/branch.h linux-4.17/fs/aufs/branch.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_BRANCH_H__ */ -diff -Naur null/fs/aufs/conf.mk linux-4.17/fs/aufs/conf.mk +diff -Naur null/fs/aufs/conf.mk linux-4.18/fs/aufs/conf.mk --- /dev/null -+++ linux-4.17/fs/aufs/conf.mk 2018-07-25 15:11:05.126257525 +0200 ++++ linux-4.18/fs/aufs/conf.mk 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -3801,9 +3801,9 @@ diff -Naur null/fs/aufs/conf.mk linux-4.17/fs/aufs/conf.mk +${obj}/sysfs.o: ${AuConfName} + +-include ${srctree}/${src}/conf_priv.mk -diff -Naur null/fs/aufs/cpup.c linux-4.17/fs/aufs/cpup.c +diff -Naur null/fs/aufs/cpup.c linux-4.18/fs/aufs/cpup.c --- /dev/null -+++ linux-4.17/fs/aufs/cpup.c 2018-07-25 15:11:05.126257525 +0200 ++++ linux-4.18/fs/aufs/cpup.c 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,1441 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5246,9 +5246,9 @@ diff -Naur null/fs/aufs/cpup.c linux-4.17/fs/aufs/cpup.c + dput(parent); + return err; +} -diff -Naur null/fs/aufs/cpup.h linux-4.17/fs/aufs/cpup.h +diff -Naur null/fs/aufs/cpup.h linux-4.18/fs/aufs/cpup.h --- /dev/null -+++ linux-4.17/fs/aufs/cpup.h 2018-07-25 15:11:05.126257525 +0200 ++++ linux-4.18/fs/aufs/cpup.h 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5342,7 +5342,7 @@ diff -Naur null/fs/aufs/cpup.h linux-4.17/fs/aufs/cpup.h +struct au_dtime { + struct dentry *dt_dentry; + struct path dt_h_path; -+ struct timespec dt_atime, dt_mtime; ++ struct timespec64 dt_atime, dt_mtime; +}; +void au_dtime_store(struct au_dtime *dt, struct dentry *dentry, + struct path *h_path); @@ -5350,9 +5350,9 @@ diff -Naur null/fs/aufs/cpup.h linux-4.17/fs/aufs/cpup.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_CPUP_H__ */ -diff -Naur null/fs/aufs/dbgaufs.c linux-4.17/fs/aufs/dbgaufs.c +diff -Naur null/fs/aufs/dbgaufs.c linux-4.18/fs/aufs/dbgaufs.c --- /dev/null -+++ linux-4.17/fs/aufs/dbgaufs.c 2018-07-25 15:11:05.126257525 +0200 ++++ linux-4.18/fs/aufs/dbgaufs.c 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,478 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5832,9 +5832,9 @@ diff -Naur null/fs/aufs/dbgaufs.c linux-4.17/fs/aufs/dbgaufs.c + err = 0; + return err; +} -diff -Naur null/fs/aufs/dbgaufs.h linux-4.17/fs/aufs/dbgaufs.h +diff -Naur null/fs/aufs/dbgaufs.h linux-4.18/fs/aufs/dbgaufs.h --- /dev/null -+++ linux-4.17/fs/aufs/dbgaufs.h 2018-07-25 15:11:05.126257525 +0200 ++++ linux-4.18/fs/aufs/dbgaufs.h 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5889,10 +5889,10 @@ diff -Naur null/fs/aufs/dbgaufs.h linux-4.17/fs/aufs/dbgaufs.h + +#endif /* __KERNEL__ */ +#endif /* __DBGAUFS_H__ */ -diff -Naur null/fs/aufs/dcsub.c linux-4.17/fs/aufs/dcsub.c +diff -Naur null/fs/aufs/dcsub.c linux-4.18/fs/aufs/dcsub.c --- /dev/null -+++ linux-4.17/fs/aufs/dcsub.c 2018-07-25 15:11:05.126257525 +0200 -@@ -0,0 +1,226 @@ ++++ linux-4.18/fs/aufs/dcsub.c 2018-08-22 21:21:36.819305363 +0200 +@@ -0,0 +1,225 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2005-2018 Junjiro R. Okajima @@ -6012,8 +6012,7 @@ diff -Naur null/fs/aufs/dcsub.c linux-4.17/fs/aufs/dcsub.c +}; + +extern void d_walk(struct dentry *parent, void *data, -+ enum d_walk_ret (*enter)(void *, struct dentry *), -+ void (*finish)(void *)); ++ enum d_walk_ret (*enter)(void *, struct dentry *)); + +struct ac_dpages_arg { + int err; @@ -6053,7 +6052,7 @@ diff -Naur null/fs/aufs/dcsub.c linux-4.17/fs/aufs/dcsub.c + .arg = arg + }; + -+ d_walk(root, &args, au_call_dpages_append, NULL); ++ d_walk(root, &args, au_call_dpages_append); + + return args.err; +} @@ -6119,9 +6118,9 @@ diff -Naur null/fs/aufs/dcsub.c linux-4.17/fs/aufs/dcsub.c + + return path_is_under(path + 0, path + 1); +} -diff -Naur null/fs/aufs/dcsub.h linux-4.17/fs/aufs/dcsub.h +diff -Naur null/fs/aufs/dcsub.h linux-4.18/fs/aufs/dcsub.h --- /dev/null -+++ linux-4.17/fs/aufs/dcsub.h 2018-07-25 15:11:05.126257525 +0200 ++++ linux-4.18/fs/aufs/dcsub.h 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6260,9 +6259,9 @@ diff -Naur null/fs/aufs/dcsub.h linux-4.17/fs/aufs/dcsub.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DCSUB_H__ */ -diff -Naur null/fs/aufs/debug.c linux-4.17/fs/aufs/debug.c +diff -Naur null/fs/aufs/debug.c linux-4.18/fs/aufs/debug.c --- /dev/null -+++ linux-4.17/fs/aufs/debug.c 2018-07-25 15:11:05.127257463 +0200 ++++ linux-4.18/fs/aufs/debug.c 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,441 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6397,7 +6396,7 @@ diff -Naur null/fs/aufs/debug.c linux-4.17/fs/aufs/debug.c + inode->i_ino, inode->i_sb ? au_sbtype(inode->i_sb) : "??", + atomic_read(&inode->i_count), inode->i_nlink, inode->i_mode, + i_size_read(inode), (unsigned long long)inode->i_blocks, -+ hn, (long long)timespec_to_ns(&inode->i_ctime) & 0x0ffff, ++ hn, (long long)timespec64_to_ns(&inode->i_ctime) & 0x0ffff, + inode->i_mapping ? inode->i_mapping->nrpages : 0, + inode->i_state, inode->i_flags, inode_peek_iversion(inode), + inode->i_generation, @@ -6705,9 +6704,9 @@ diff -Naur null/fs/aufs/debug.c linux-4.17/fs/aufs/debug.c + + return 0; +} -diff -Naur null/fs/aufs/debug.h linux-4.17/fs/aufs/debug.h +diff -Naur null/fs/aufs/debug.h linux-4.18/fs/aufs/debug.h --- /dev/null -+++ linux-4.17/fs/aufs/debug.h 2018-07-25 15:11:05.127257463 +0200 ++++ linux-4.18/fs/aufs/debug.h 2018-08-22 21:21:36.819305363 +0200 @@ -0,0 +1,226 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6935,9 +6934,9 @@ diff -Naur null/fs/aufs/debug.h linux-4.17/fs/aufs/debug.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DEBUG_H__ */ -diff -Naur null/fs/aufs/dentry.c linux-4.17/fs/aufs/dentry.c +diff -Naur null/fs/aufs/dentry.c linux-4.18/fs/aufs/dentry.c --- /dev/null -+++ linux-4.17/fs/aufs/dentry.c 2018-07-25 15:11:05.127257463 +0200 ++++ linux-4.18/fs/aufs/dentry.c 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,1153 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -8092,9 +8091,9 @@ diff -Naur null/fs/aufs/dentry.c linux-4.17/fs/aufs/dentry.c +const struct dentry_operations aufs_dop_noreval = { + .d_release = aufs_d_release +}; -diff -Naur null/fs/aufs/dentry.h linux-4.17/fs/aufs/dentry.h +diff -Naur null/fs/aufs/dentry.h linux-4.18/fs/aufs/dentry.h --- /dev/null -+++ linux-4.17/fs/aufs/dentry.h 2018-07-25 15:11:05.127257463 +0200 ++++ linux-4.18/fs/aufs/dentry.h 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,267 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -8363,9 +8362,9 @@ diff -Naur null/fs/aufs/dentry.h linux-4.17/fs/aufs/dentry.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DENTRY_H__ */ -diff -Naur null/fs/aufs/dinfo.c linux-4.17/fs/aufs/dinfo.c +diff -Naur null/fs/aufs/dinfo.c linux-4.18/fs/aufs/dinfo.c --- /dev/null -+++ linux-4.17/fs/aufs/dinfo.c 2018-07-25 15:11:05.127257463 +0200 ++++ linux-4.18/fs/aufs/dinfo.c 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -8921,9 +8920,9 @@ diff -Naur null/fs/aufs/dinfo.c linux-4.17/fs/aufs/dinfo.c + return bindex; + return -1; +} -diff -Naur null/fs/aufs/dir.c linux-4.17/fs/aufs/dir.c +diff -Naur null/fs/aufs/dir.c linux-4.18/fs/aufs/dir.c --- /dev/null -+++ linux-4.17/fs/aufs/dir.c 2018-07-25 15:11:05.127257463 +0200 ++++ linux-4.18/fs/aufs/dir.c 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,760 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9071,7 +9070,7 @@ diff -Naur null/fs/aufs/dir.c linux-4.17/fs/aufs/dir.c + au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT); + h_dir = au_h_iptr(dir, btop); + if (h_dir->i_nlink -+ && timespec_compare(&h_dir->i_mtime, &dt.dt_mtime) < 0) { ++ && timespec64_compare(&h_dir->i_mtime, &dt.dt_mtime) < 0) { + dt.dt_h_path = h_path; + au_dtime_revert(&dt); + } @@ -9685,9 +9684,9 @@ diff -Naur null/fs/aufs/dir.c linux-4.17/fs/aufs/dir.c + .flush = aufs_flush_dir, + .fsync = aufs_fsync_dir +}; -diff -Naur null/fs/aufs/dir.h linux-4.17/fs/aufs/dir.h +diff -Naur null/fs/aufs/dir.h linux-4.18/fs/aufs/dir.h --- /dev/null -+++ linux-4.17/fs/aufs/dir.h 2018-07-25 15:11:05.127257463 +0200 ++++ linux-4.18/fs/aufs/dir.h 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -9821,9 +9820,9 @@ diff -Naur null/fs/aufs/dir.h linux-4.17/fs/aufs/dir.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DIR_H__ */ -diff -Naur null/fs/aufs/dirren.c linux-4.17/fs/aufs/dirren.c +diff -Naur null/fs/aufs/dirren.c linux-4.18/fs/aufs/dirren.c --- /dev/null -+++ linux-4.17/fs/aufs/dirren.c 2018-07-25 15:11:05.127257463 +0200 ++++ linux-4.18/fs/aufs/dirren.c 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,1316 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11141,9 +11140,9 @@ diff -Naur null/fs/aufs/dirren.c linux-4.17/fs/aufs/dirren.c +out: + return err; +} -diff -Naur null/fs/aufs/dirren.h linux-4.17/fs/aufs/dirren.h +diff -Naur null/fs/aufs/dirren.h linux-4.18/fs/aufs/dirren.h --- /dev/null -+++ linux-4.17/fs/aufs/dirren.h 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/dirren.h 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11285,9 +11284,9 @@ diff -Naur null/fs/aufs/dirren.h linux-4.17/fs/aufs/dirren.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DIRREN_H__ */ -diff -Naur null/fs/aufs/dynop.c linux-4.17/fs/aufs/dynop.c +diff -Naur null/fs/aufs/dynop.c linux-4.18/fs/aufs/dynop.c --- /dev/null -+++ linux-4.17/fs/aufs/dynop.c 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/dynop.c 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,370 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11659,9 +11658,9 @@ diff -Naur null/fs/aufs/dynop.c linux-4.17/fs/aufs/dynop.c + for (i = 0; i < AuDyLast; i++) + WARN_ON(!hlist_bl_empty(dynop + i)); +} -diff -Naur null/fs/aufs/dynop.h linux-4.17/fs/aufs/dynop.h +diff -Naur null/fs/aufs/dynop.h linux-4.18/fs/aufs/dynop.h --- /dev/null -+++ linux-4.17/fs/aufs/dynop.h 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/dynop.h 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,75 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11738,9 +11737,9 @@ diff -Naur null/fs/aufs/dynop.h linux-4.17/fs/aufs/dynop.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DYNOP_H__ */ -diff -Naur null/fs/aufs/export.c linux-4.17/fs/aufs/export.c +diff -Naur null/fs/aufs/export.c linux-4.18/fs/aufs/export.c --- /dev/null -+++ linux-4.17/fs/aufs/export.c 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/export.c 2018-08-22 21:21:36.820305341 +0200 @@ -0,0 +1,838 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -12580,9 +12579,9 @@ diff -Naur null/fs/aufs/export.c linux-4.17/fs/aufs/export.c + BUILD_BUG_ON(sizeof(u) != sizeof(int)); + atomic_set(&sbinfo->si_xigen_next, u); +} -diff -Naur null/fs/aufs/fhsm.c linux-4.17/fs/aufs/fhsm.c +diff -Naur null/fs/aufs/fhsm.c linux-4.18/fs/aufs/fhsm.c --- /dev/null -+++ linux-4.17/fs/aufs/fhsm.c 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/fhsm.c 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13011,9 +13010,9 @@ diff -Naur null/fs/aufs/fhsm.c linux-4.17/fs/aufs/fhsm.c + if (u != AUFS_FHSM_CACHE_DEF_SEC) + seq_printf(seq, ",fhsm_sec=%u", u); +} -diff -Naur null/fs/aufs/file.c linux-4.17/fs/aufs/file.c +diff -Naur null/fs/aufs/file.c linux-4.18/fs/aufs/file.c --- /dev/null -+++ linux-4.17/fs/aufs/file.c 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/file.c 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,857 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13872,9 +13871,9 @@ diff -Naur null/fs/aufs/file.c linux-4.17/fs/aufs/file.c + .swap_deactivate = aufs_swap_deactivate +#endif /* CONFIG_AUFS_DEBUG */ +}; -diff -Naur null/fs/aufs/file.h linux-4.17/fs/aufs/file.h +diff -Naur null/fs/aufs/file.h linux-4.18/fs/aufs/file.h --- /dev/null -+++ linux-4.17/fs/aufs/file.h 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/file.h 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,341 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -13971,7 +13970,7 @@ diff -Naur null/fs/aufs/file.h linux-4.17/fs/aufs/file.h + +/* poll.c */ +#ifdef CONFIG_AUFS_POLL -+__poll_t aufs_poll(struct file *file, poll_table *wait); ++__poll_t aufs_poll(struct file *file, struct poll_table_struct *pt); +#endif + +#ifdef CONFIG_AUFS_BR_HFSPLUS @@ -14217,9 +14216,9 @@ diff -Naur null/fs/aufs/file.h linux-4.17/fs/aufs/file.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_FILE_H__ */ -diff -Naur null/fs/aufs/finfo.c linux-4.17/fs/aufs/finfo.c +diff -Naur null/fs/aufs/finfo.c linux-4.18/fs/aufs/finfo.c --- /dev/null -+++ linux-4.17/fs/aufs/finfo.c 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/finfo.c 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -14370,9 +14369,9 @@ diff -Naur null/fs/aufs/finfo.c linux-4.17/fs/aufs/finfo.c +out: + return err; +} -diff -Naur null/fs/aufs/f_op.c linux-4.17/fs/aufs/f_op.c +diff -Naur null/fs/aufs/f_op.c linux-4.18/fs/aufs/f_op.c --- /dev/null -+++ linux-4.17/fs/aufs/f_op.c 2018-07-25 15:11:05.128257402 +0200 ++++ linux-4.18/fs/aufs/f_op.c 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,818 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -15192,9 +15191,9 @@ diff -Naur null/fs/aufs/f_op.c linux-4.17/fs/aufs/f_op.c + .fallocate = aufs_fallocate, + .copy_file_range = aufs_copy_file_range +}; -diff -Naur null/fs/aufs/fstype.h linux-4.17/fs/aufs/fstype.h +diff -Naur null/fs/aufs/fstype.h linux-4.18/fs/aufs/fstype.h --- /dev/null -+++ linux-4.17/fs/aufs/fstype.h 2018-07-25 15:11:05.129257341 +0200 ++++ linux-4.18/fs/aufs/fstype.h 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,401 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -15597,9 +15596,9 @@ diff -Naur null/fs/aufs/fstype.h linux-4.17/fs/aufs/fstype.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_FSTYPE_H__ */ -diff -Naur null/fs/aufs/hbl.h linux-4.17/fs/aufs/hbl.h +diff -Naur null/fs/aufs/hbl.h linux-4.18/fs/aufs/hbl.h --- /dev/null -+++ linux-4.17/fs/aufs/hbl.h 2018-07-25 15:11:05.129257341 +0200 ++++ linux-4.18/fs/aufs/hbl.h 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -15666,9 +15665,9 @@ diff -Naur null/fs/aufs/hbl.h linux-4.17/fs/aufs/hbl.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_HBL_H__ */ -diff -Naur null/fs/aufs/hfsnotify.c linux-4.17/fs/aufs/hfsnotify.c +diff -Naur null/fs/aufs/hfsnotify.c linux-4.18/fs/aufs/hfsnotify.c --- /dev/null -+++ linux-4.17/fs/aufs/hfsnotify.c 2018-07-25 15:11:05.129257341 +0200 ++++ linux-4.18/fs/aufs/hfsnotify.c 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,290 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -15834,8 +15833,6 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-4.17/fs/aufs/hfsnotify.c + +static int au_hfsn_handle_event(struct fsnotify_group *group, + struct inode *inode, -+ struct fsnotify_mark *inode_mark, -+ struct fsnotify_mark *vfsmount_mark, + u32 mask, const void *data, int data_type, + const unsigned char *file_name, u32 cookie, + struct fsnotify_iter_info *iter_info) @@ -15844,6 +15841,7 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-4.17/fs/aufs/hfsnotify.c + struct au_hnotify *hnotify; + struct inode *h_dir, *h_inode; + struct qstr h_child_qstr = QSTR_INIT(file_name, strlen(file_name)); ++ struct fsnotify_mark *inode_mark; + + AuDebugOn(data_type != FSNOTIFY_EVENT_INODE); + @@ -15867,6 +15865,7 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-4.17/fs/aufs/hfsnotify.c + au_debug_off(); +#endif + ++ inode_mark = fsnotify_iter_inode_mark(iter_info); + AuDebugOn(!inode_mark); + hnotify = container_of(inode_mark, struct au_hnotify, hn_mark); + err = au_hnotify(h_dir, hnotify, mask, &h_child_qstr, h_inode); @@ -15960,9 +15959,9 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-4.17/fs/aufs/hfsnotify.c + .fin_br = au_hfsn_fin_br, + .init_br = au_hfsn_init_br +}; -diff -Naur null/fs/aufs/hfsplus.c linux-4.17/fs/aufs/hfsplus.c +diff -Naur null/fs/aufs/hfsplus.c linux-4.18/fs/aufs/hfsplus.c --- /dev/null -+++ linux-4.17/fs/aufs/hfsplus.c 2018-07-25 15:11:05.129257341 +0200 ++++ linux-4.18/fs/aufs/hfsplus.c 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -16021,9 +16020,9 @@ diff -Naur null/fs/aufs/hfsplus.c linux-4.17/fs/aufs/hfsplus.c + au_sbr_put(dentry->d_sb, bindex); + } +} -diff -Naur null/fs/aufs/hnotify.c linux-4.17/fs/aufs/hnotify.c +diff -Naur null/fs/aufs/hnotify.c linux-4.18/fs/aufs/hnotify.c --- /dev/null -+++ linux-4.17/fs/aufs/hnotify.c 2018-07-25 15:11:05.129257341 +0200 ++++ linux-4.18/fs/aufs/hnotify.c 2018-08-22 21:21:36.821305319 +0200 @@ -0,0 +1,720 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -16745,9 +16744,9 @@ diff -Naur null/fs/aufs/hnotify.c linux-4.17/fs/aufs/hnotify.c + if (au_cache[AuCache_HNOTIFY]) + au_hn_destroy_cache(); +} -diff -Naur null/fs/aufs/iinfo.c linux-4.17/fs/aufs/iinfo.c +diff -Naur null/fs/aufs/iinfo.c linux-4.18/fs/aufs/iinfo.c --- /dev/null -+++ linux-4.17/fs/aufs/iinfo.c 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/iinfo.c 2018-08-22 21:21:36.822305297 +0200 @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17035,9 +17034,9 @@ diff -Naur null/fs/aufs/iinfo.c linux-4.17/fs/aufs/iinfo.c + kfree(iinfo->ii_hinode); + AuRwDestroy(&iinfo->ii_rwsem); +} -diff -Naur null/fs/aufs/inode.c linux-4.17/fs/aufs/inode.c +diff -Naur null/fs/aufs/inode.c linux-4.18/fs/aufs/inode.c --- /dev/null -+++ linux-4.17/fs/aufs/inode.c 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/inode.c 2018-08-22 21:21:36.822305297 +0200 @@ -0,0 +1,528 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17567,9 +17566,9 @@ diff -Naur null/fs/aufs/inode.c linux-4.17/fs/aufs/inode.c + mask |= MAY_READ; /* force permission check */ + return au_test_h_perm(h_inode, mask); +} -diff -Naur null/fs/aufs/inode.h linux-4.17/fs/aufs/inode.h +diff -Naur null/fs/aufs/inode.h linux-4.18/fs/aufs/inode.h --- /dev/null -+++ linux-4.17/fs/aufs/inode.h 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/inode.h 2018-08-22 21:21:36.822305297 +0200 @@ -0,0 +1,696 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -18267,9 +18266,9 @@ diff -Naur null/fs/aufs/inode.h linux-4.17/fs/aufs/inode.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_INODE_H__ */ -diff -Naur null/fs/aufs/ioctl.c linux-4.17/fs/aufs/ioctl.c +diff -Naur null/fs/aufs/ioctl.c linux-4.18/fs/aufs/ioctl.c --- /dev/null -+++ linux-4.17/fs/aufs/ioctl.c 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/ioctl.c 2018-08-22 21:21:36.822305297 +0200 @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18491,9 +18490,9 @@ diff -Naur null/fs/aufs/ioctl.c linux-4.17/fs/aufs/ioctl.c + return aufs_ioctl_nondir(file, cmd, (unsigned long)compat_ptr(arg)); +} +#endif -diff -Naur null/fs/aufs/i_op_add.c linux-4.17/fs/aufs/i_op_add.c +diff -Naur null/fs/aufs/i_op_add.c linux-4.18/fs/aufs/i_op_add.c --- /dev/null -+++ linux-4.17/fs/aufs/i_op_add.c 2018-07-25 15:11:05.129257341 +0200 ++++ linux-4.18/fs/aufs/i_op_add.c 2018-08-22 21:21:36.822305297 +0200 @@ -0,0 +1,921 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -19416,9 +19415,9 @@ diff -Naur null/fs/aufs/i_op_add.c linux-4.17/fs/aufs/i_op_add.c +out: + return err; +} -diff -Naur null/fs/aufs/i_op.c linux-4.17/fs/aufs/i_op.c +diff -Naur null/fs/aufs/i_op.c linux-4.18/fs/aufs/i_op.c --- /dev/null -+++ linux-4.17/fs/aufs/i_op.c 2018-07-25 15:11:05.129257341 +0200 ++++ linux-4.18/fs/aufs/i_op.c 2018-08-22 21:21:36.822305297 +0200 @@ -0,0 +1,1460 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -20757,7 +20756,7 @@ diff -Naur null/fs/aufs/i_op.c linux-4.17/fs/aufs/i_op.c + return (inode->i_mode & (S_IFBLK | S_IFCHR | S_IFIFO | S_IFSOCK)); +} + -+static int aufs_update_time(struct inode *inode, struct timespec *ts, int flags) ++static int aufs_update_time(struct inode *inode, struct timespec64 *ts, int flags) +{ + int err; + aufs_bindex_t bindex; @@ -20880,9 +20879,9 @@ diff -Naur null/fs/aufs/i_op.c linux-4.17/fs/aufs/i_op.c + .update_time = aufs_update_time + } +}; -diff -Naur null/fs/aufs/i_op_del.c linux-4.17/fs/aufs/i_op_del.c +diff -Naur null/fs/aufs/i_op_del.c linux-4.18/fs/aufs/i_op_del.c --- /dev/null -+++ linux-4.17/fs/aufs/i_op_del.c 2018-07-25 15:11:05.129257341 +0200 ++++ linux-4.18/fs/aufs/i_op_del.c 2018-08-22 21:21:36.822305297 +0200 @@ -0,0 +1,512 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -21396,9 +21395,9 @@ diff -Naur null/fs/aufs/i_op_del.c linux-4.17/fs/aufs/i_op_del.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/i_op_ren.c linux-4.17/fs/aufs/i_op_ren.c +diff -Naur null/fs/aufs/i_op_ren.c linux-4.18/fs/aufs/i_op_ren.c --- /dev/null -+++ linux-4.17/fs/aufs/i_op_ren.c 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/i_op_ren.c 2018-08-22 21:21:36.822305297 +0200 @@ -0,0 +1,1247 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22647,9 +22646,9 @@ diff -Naur null/fs/aufs/i_op_ren.c linux-4.17/fs/aufs/i_op_ren.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/Kconfig linux-4.17/fs/aufs/Kconfig +diff -Naur null/fs/aufs/Kconfig linux-4.18/fs/aufs/Kconfig --- /dev/null -+++ linux-4.17/fs/aufs/Kconfig 2018-07-25 15:11:05.125257586 +0200 ++++ linux-4.18/fs/aufs/Kconfig 2018-08-22 21:21:36.818305384 +0200 @@ -0,0 +1,199 @@ +# SPDX-License-Identifier: GPL-2.0 +config AUFS_FS @@ -22850,9 +22849,9 @@ diff -Naur null/fs/aufs/Kconfig linux-4.17/fs/aufs/Kconfig + Automatic configuration for internal use. + When aufs supports Magic SysRq, enabled automatically. +endif -diff -Naur null/fs/aufs/loop.c linux-4.17/fs/aufs/loop.c +diff -Naur null/fs/aufs/loop.c linux-4.18/fs/aufs/loop.c --- /dev/null -+++ linux-4.17/fs/aufs/loop.c 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/loop.c 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -23002,9 +23001,9 @@ diff -Naur null/fs/aufs/loop.c linux-4.17/fs/aufs/loop.c + symbol_put(loop_backing_file); + kfree(au_warn_loopback_array); +} -diff -Naur null/fs/aufs/loop.h linux-4.17/fs/aufs/loop.h +diff -Naur null/fs/aufs/loop.h linux-4.18/fs/aufs/loop.h --- /dev/null -+++ linux-4.17/fs/aufs/loop.h 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/loop.h 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -23059,9 +23058,9 @@ diff -Naur null/fs/aufs/loop.h linux-4.17/fs/aufs/loop.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_LOOP_H__ */ -diff -Naur null/fs/aufs/magic.mk linux-4.17/fs/aufs/magic.mk +diff -Naur null/fs/aufs/magic.mk linux-4.18/fs/aufs/magic.mk --- /dev/null -+++ linux-4.17/fs/aufs/magic.mk 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/magic.mk 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -23094,9 +23093,9 @@ diff -Naur null/fs/aufs/magic.mk linux-4.17/fs/aufs/magic.mk +ifdef CONFIG_HFSPLUS_FS +ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b +endif -diff -Naur null/fs/aufs/Makefile linux-4.17/fs/aufs/Makefile +diff -Naur null/fs/aufs/Makefile linux-4.18/fs/aufs/Makefile --- /dev/null -+++ linux-4.17/fs/aufs/Makefile 2018-07-25 15:11:05.125257586 +0200 ++++ linux-4.18/fs/aufs/Makefile 2018-08-22 21:21:36.818305384 +0200 @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -23144,9 +23143,9 @@ diff -Naur null/fs/aufs/Makefile linux-4.17/fs/aufs/Makefile +aufs-$(CONFIG_AUFS_BR_HFSPLUS) += hfsplus.o +aufs-$(CONFIG_AUFS_DEBUG) += debug.o +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o -diff -Naur null/fs/aufs/module.c linux-4.17/fs/aufs/module.c +diff -Naur null/fs/aufs/module.c linux-4.18/fs/aufs/module.c --- /dev/null -+++ linux-4.17/fs/aufs/module.c 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/module.c 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,273 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -23421,9 +23420,9 @@ diff -Naur null/fs/aufs/module.c linux-4.17/fs/aufs/module.c + +module_init(aufs_init); +module_exit(aufs_exit); -diff -Naur null/fs/aufs/module.h linux-4.17/fs/aufs/module.h +diff -Naur null/fs/aufs/module.h linux-4.18/fs/aufs/module.h --- /dev/null -+++ linux-4.17/fs/aufs/module.h 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/module.h 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -23527,9 +23526,9 @@ diff -Naur null/fs/aufs/module.h linux-4.17/fs/aufs/module.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_MODULE_H__ */ -diff -Naur null/fs/aufs/mvdown.c linux-4.17/fs/aufs/mvdown.c +diff -Naur null/fs/aufs/mvdown.c linux-4.18/fs/aufs/mvdown.c --- /dev/null -+++ linux-4.17/fs/aufs/mvdown.c 2018-07-25 15:11:05.130257280 +0200 ++++ linux-4.18/fs/aufs/mvdown.c 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,705 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24236,9 +24235,9 @@ diff -Naur null/fs/aufs/mvdown.c linux-4.17/fs/aufs/mvdown.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/opts.c linux-4.17/fs/aufs/opts.c +diff -Naur null/fs/aufs/opts.c linux-4.18/fs/aufs/opts.c --- /dev/null -+++ linux-4.17/fs/aufs/opts.c 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/opts.c 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,1891 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26131,9 +26130,9 @@ diff -Naur null/fs/aufs/opts.c linux-4.17/fs/aufs/opts.c +{ + return au_mntflags(sb) & AuOptMask_UDBA; +} -diff -Naur null/fs/aufs/opts.h linux-4.17/fs/aufs/opts.h +diff -Naur null/fs/aufs/opts.h linux-4.18/fs/aufs/opts.h --- /dev/null -+++ linux-4.17/fs/aufs/opts.h 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/opts.h 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,225 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -26360,9 +26359,9 @@ diff -Naur null/fs/aufs/opts.h linux-4.17/fs/aufs/opts.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_OPTS_H__ */ -diff -Naur null/fs/aufs/plink.c linux-4.17/fs/aufs/plink.c +diff -Naur null/fs/aufs/plink.c linux-4.18/fs/aufs/plink.c --- /dev/null -+++ linux-4.17/fs/aufs/plink.c 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/plink.c 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,516 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26880,10 +26879,10 @@ diff -Naur null/fs/aufs/plink.c linux-4.17/fs/aufs/plink.c + } + } +} -diff -Naur null/fs/aufs/poll.c linux-4.17/fs/aufs/poll.c +diff -Naur null/fs/aufs/poll.c linux-4.18/fs/aufs/poll.c --- /dev/null -+++ linux-4.17/fs/aufs/poll.c 2018-07-25 15:11:05.131257218 +0200 -@@ -0,0 +1,54 @@ ++++ linux-4.18/fs/aufs/poll.c 2018-08-22 21:21:36.823305275 +0200 +@@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2005-2018 Junjiro R. Okajima @@ -26909,7 +26908,7 @@ diff -Naur null/fs/aufs/poll.c linux-4.17/fs/aufs/poll.c + +#include "aufs.h" + -+__poll_t aufs_poll(struct file *file, poll_table *wait) ++__poll_t aufs_poll(struct file *file, struct poll_table_struct *pt) +{ + __poll_t mask; + struct file *h_file; @@ -26926,10 +26925,7 @@ diff -Naur null/fs/aufs/poll.c linux-4.17/fs/aufs/poll.c + goto out; + } + -+ /* it is not an error if h_file has no operation */ -+ mask = DEFAULT_POLLMASK; -+ if (h_file->f_op->poll) -+ mask = h_file->f_op->poll(h_file, wait); ++ mask = vfs_poll(h_file, pt); + fput(h_file); /* instead of au_read_post() */ + +out: @@ -26938,9 +26934,9 @@ diff -Naur null/fs/aufs/poll.c linux-4.17/fs/aufs/poll.c + AuDbg("mask 0x%x\n", mask); + return mask; +} -diff -Naur null/fs/aufs/posix_acl.c linux-4.17/fs/aufs/posix_acl.c +diff -Naur null/fs/aufs/posix_acl.c linux-4.18/fs/aufs/posix_acl.c --- /dev/null -+++ linux-4.17/fs/aufs/posix_acl.c 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/posix_acl.c 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,103 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27045,9 +27041,9 @@ diff -Naur null/fs/aufs/posix_acl.c linux-4.17/fs/aufs/posix_acl.c +out: + return err; +} -diff -Naur null/fs/aufs/procfs.c linux-4.17/fs/aufs/procfs.c +diff -Naur null/fs/aufs/procfs.c linux-4.18/fs/aufs/procfs.c --- /dev/null -+++ linux-4.17/fs/aufs/procfs.c 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/procfs.c 2018-08-22 21:21:36.823305275 +0200 @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27220,9 +27216,9 @@ diff -Naur null/fs/aufs/procfs.c linux-4.17/fs/aufs/procfs.c +out: + return err; +} -diff -Naur null/fs/aufs/rdu.c linux-4.17/fs/aufs/rdu.c +diff -Naur null/fs/aufs/rdu.c linux-4.18/fs/aufs/rdu.c --- /dev/null -+++ linux-4.17/fs/aufs/rdu.c 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/rdu.c 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,382 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27606,9 +27602,9 @@ diff -Naur null/fs/aufs/rdu.c linux-4.17/fs/aufs/rdu.c + return err; +} +#endif -diff -Naur null/fs/aufs/rwsem.h linux-4.17/fs/aufs/rwsem.h +diff -Naur null/fs/aufs/rwsem.h linux-4.18/fs/aufs/rwsem.h --- /dev/null -+++ linux-4.17/fs/aufs/rwsem.h 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/rwsem.h 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,73 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -27683,9 +27679,9 @@ diff -Naur null/fs/aufs/rwsem.h linux-4.17/fs/aufs/rwsem.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_RWSEM_H__ */ -diff -Naur null/fs/aufs/sbinfo.c linux-4.17/fs/aufs/sbinfo.c +diff -Naur null/fs/aufs/sbinfo.c linux-4.18/fs/aufs/sbinfo.c --- /dev/null -+++ linux-4.17/fs/aufs/sbinfo.c 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/sbinfo.c 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,312 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27999,9 +27995,9 @@ diff -Naur null/fs/aufs/sbinfo.c linux-4.17/fs/aufs/sbinfo.c + di_write_unlock2(d1, d2); + si_read_unlock(d1->d_sb); +} -diff -Naur null/fs/aufs/super.c linux-4.17/fs/aufs/super.c +diff -Naur null/fs/aufs/super.c linux-4.18/fs/aufs/super.c --- /dev/null -+++ linux-4.17/fs/aufs/super.c 2018-07-25 15:11:05.131257218 +0200 ++++ linux-4.18/fs/aufs/super.c 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,1043 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29046,9 +29042,9 @@ diff -Naur null/fs/aufs/super.c linux-4.17/fs/aufs/super.c + /* no need to __module_get() and module_put(). */ + .owner = THIS_MODULE, +}; -diff -Naur null/fs/aufs/super.h linux-4.17/fs/aufs/super.h +diff -Naur null/fs/aufs/super.h linux-4.18/fs/aufs/super.h --- /dev/null -+++ linux-4.17/fs/aufs/super.h 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/super.h 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,627 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -29677,9 +29673,9 @@ diff -Naur null/fs/aufs/super.h linux-4.17/fs/aufs/super.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_SUPER_H__ */ -diff -Naur null/fs/aufs/sysaufs.c linux-4.17/fs/aufs/sysaufs.c +diff -Naur null/fs/aufs/sysaufs.c linux-4.18/fs/aufs/sysaufs.c --- /dev/null -+++ linux-4.17/fs/aufs/sysaufs.c 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/sysaufs.c 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29774,9 +29770,9 @@ diff -Naur null/fs/aufs/sysaufs.c linux-4.17/fs/aufs/sysaufs.c +out: + return err; +} -diff -Naur null/fs/aufs/sysaufs.h linux-4.17/fs/aufs/sysaufs.h +diff -Naur null/fs/aufs/sysaufs.h linux-4.18/fs/aufs/sysaufs.h --- /dev/null -+++ linux-4.17/fs/aufs/sysaufs.h 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/sysaufs.h 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -29880,9 +29876,9 @@ diff -Naur null/fs/aufs/sysaufs.h linux-4.17/fs/aufs/sysaufs.h + +#endif /* __KERNEL__ */ +#endif /* __SYSAUFS_H__ */ -diff -Naur null/fs/aufs/sysfs.c linux-4.17/fs/aufs/sysfs.c +diff -Naur null/fs/aufs/sysfs.c linux-4.18/fs/aufs/sysfs.c --- /dev/null -+++ linux-4.17/fs/aufs/sysfs.c 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/sysfs.c 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,373 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30257,9 +30253,9 @@ diff -Naur null/fs/aufs/sysfs.c linux-4.17/fs/aufs/sysfs.c + } + } +} -diff -Naur null/fs/aufs/sysrq.c linux-4.17/fs/aufs/sysrq.c +diff -Naur null/fs/aufs/sysrq.c linux-4.18/fs/aufs/sysrq.c --- /dev/null -+++ linux-4.17/fs/aufs/sysrq.c 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/sysrq.c 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30421,9 +30417,9 @@ diff -Naur null/fs/aufs/sysrq.c linux-4.17/fs/aufs/sysrq.c + if (unlikely(err)) + pr_err("err %d (ignored)\n", err); +} -diff -Naur null/fs/aufs/vdir.c linux-4.17/fs/aufs/vdir.c +diff -Naur null/fs/aufs/vdir.c linux-4.18/fs/aufs/vdir.c --- /dev/null -+++ linux-4.17/fs/aufs/vdir.c 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/vdir.c 2018-08-22 21:21:36.824305253 +0200 @@ -0,0 +1,894 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31319,9 +31315,9 @@ diff -Naur null/fs/aufs/vdir.c linux-4.17/fs/aufs/vdir.c + /* smp_mb(); */ + return 0; +} -diff -Naur null/fs/aufs/vfsub.c linux-4.17/fs/aufs/vfsub.c +diff -Naur null/fs/aufs/vfsub.c linux-4.18/fs/aufs/vfsub.c --- /dev/null -+++ linux-4.17/fs/aufs/vfsub.c 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/vfsub.c 2018-08-22 21:21:36.825305231 +0200 @@ -0,0 +1,895 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -32218,9 +32214,9 @@ diff -Naur null/fs/aufs/vfsub.c linux-4.17/fs/aufs/vfsub.c + + return err; +} -diff -Naur null/fs/aufs/vfsub.h linux-4.17/fs/aufs/vfsub.h +diff -Naur null/fs/aufs/vfsub.h linux-4.18/fs/aufs/vfsub.h --- /dev/null -+++ linux-4.17/fs/aufs/vfsub.h 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/vfsub.h 2018-08-22 21:21:36.825305231 +0200 @@ -0,0 +1,355 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -32451,8 +32447,8 @@ diff -Naur null/fs/aufs/vfsub.h linux-4.17/fs/aufs/vfsub.h +} +#endif + -+static inline int vfsub_update_time(struct inode *h_inode, struct timespec *ts, -+ int flags) ++static inline int vfsub_update_time(struct inode *h_inode, ++ struct timespec64 *ts, int flags) +{ + return update_time(h_inode, ts, flags); + /* no vfsub_update_h_iattr() since we don't have struct path */ @@ -32577,9 +32573,9 @@ diff -Naur null/fs/aufs/vfsub.h linux-4.17/fs/aufs/vfsub.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_VFSUB_H__ */ -diff -Naur null/fs/aufs/wbr_policy.c linux-4.17/fs/aufs/wbr_policy.c +diff -Naur null/fs/aufs/wbr_policy.c linux-4.18/fs/aufs/wbr_policy.c --- /dev/null -+++ linux-4.17/fs/aufs/wbr_policy.c 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/wbr_policy.c 2018-08-22 21:21:36.825305231 +0200 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -33411,9 +33407,9 @@ diff -Naur null/fs/aufs/wbr_policy.c linux-4.17/fs/aufs/wbr_policy.c + .fin = au_wbr_create_fin_mfs + } +}; -diff -Naur null/fs/aufs/whout.c linux-4.17/fs/aufs/whout.c +diff -Naur null/fs/aufs/whout.c linux-4.18/fs/aufs/whout.c --- /dev/null -+++ linux-4.17/fs/aufs/whout.c 2018-07-25 15:11:05.132257157 +0200 ++++ linux-4.18/fs/aufs/whout.c 2018-08-22 21:21:36.825305231 +0200 @@ -0,0 +1,1062 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -34477,9 +34473,9 @@ diff -Naur null/fs/aufs/whout.c linux-4.17/fs/aufs/whout.c + au_whtmp_rmdir_free(args); + } +} -diff -Naur null/fs/aufs/whout.h linux-4.17/fs/aufs/whout.h +diff -Naur null/fs/aufs/whout.h linux-4.18/fs/aufs/whout.h --- /dev/null -+++ linux-4.17/fs/aufs/whout.h 2018-07-25 15:11:05.133257096 +0200 ++++ linux-4.18/fs/aufs/whout.h 2018-08-22 21:21:36.825305231 +0200 @@ -0,0 +1,86 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -34567,9 +34563,9 @@ diff -Naur null/fs/aufs/whout.h linux-4.17/fs/aufs/whout.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_WHOUT_H__ */ -diff -Naur null/fs/aufs/wkq.c linux-4.17/fs/aufs/wkq.c +diff -Naur null/fs/aufs/wkq.c linux-4.18/fs/aufs/wkq.c --- /dev/null -+++ linux-4.17/fs/aufs/wkq.c 2018-07-25 15:11:05.133257096 +0200 ++++ linux-4.18/fs/aufs/wkq.c 2018-08-22 21:21:36.825305231 +0200 @@ -0,0 +1,391 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -34962,9 +34958,9 @@ diff -Naur null/fs/aufs/wkq.c linux-4.17/fs/aufs/wkq.c + + return err; +} -diff -Naur null/fs/aufs/wkq.h linux-4.17/fs/aufs/wkq.h +diff -Naur null/fs/aufs/wkq.h linux-4.18/fs/aufs/wkq.h --- /dev/null -+++ linux-4.17/fs/aufs/wkq.h 2018-07-25 15:11:05.133257096 +0200 ++++ linux-4.18/fs/aufs/wkq.h 2018-08-22 21:21:36.825305231 +0200 @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -35060,9 +35056,9 @@ diff -Naur null/fs/aufs/wkq.h linux-4.17/fs/aufs/wkq.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_WKQ_H__ */ -diff -Naur null/fs/aufs/xattr.c linux-4.17/fs/aufs/xattr.c +diff -Naur null/fs/aufs/xattr.c linux-4.18/fs/aufs/xattr.c --- /dev/null -+++ linux-4.17/fs/aufs/xattr.c 2018-07-25 15:11:05.133257096 +0200 ++++ linux-4.18/fs/aufs/xattr.c 2018-08-22 21:21:36.825305231 +0200 @@ -0,0 +1,356 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35420,9 +35416,9 @@ diff -Naur null/fs/aufs/xattr.c linux-4.17/fs/aufs/xattr.c +{ + sb->s_xattr = au_xattr_handlers; +} -diff -Naur null/fs/aufs/xino.c linux-4.17/fs/aufs/xino.c +diff -Naur null/fs/aufs/xino.c linux-4.18/fs/aufs/xino.c --- /dev/null -+++ linux-4.17/fs/aufs/xino.c 2018-07-25 15:11:05.133257096 +0200 ++++ linux-4.18/fs/aufs/xino.c 2018-08-22 21:21:36.826305209 +0200 @@ -0,0 +1,1593 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -37017,9 +37013,9 @@ diff -Naur null/fs/aufs/xino.c linux-4.17/fs/aufs/xino.c +out: + return err; +} -diff -Naur null/include/uapi/linux/aufs_type.h linux-4.17/include/uapi/linux/aufs_type.h +diff -Naur null/include/uapi/linux/aufs_type.h linux-4.18/include/uapi/linux/aufs_type.h --- /dev/null -+++ linux-4.17/include/uapi/linux/aufs_type.h 2018-07-25 15:11:05.133257096 +0200 ++++ linux-4.18/include/uapi/linux/aufs_type.h 2018-08-22 21:21:36.826305209 +0200 @@ -0,0 +1,448 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -37063,7 +37059,7 @@ diff -Naur null/include/uapi/linux/aufs_type.h linux-4.17/include/uapi/linux/auf + +#include + -+#define AUFS_VERSION "4.17-20180723" ++#define AUFS_VERSION "4.18-20180820" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') diff --git a/talimatname/genel/k/kernel/config b/talimatname/genel/k/kernel/config index bbbb9e919..d93be84a8 100644 --- a/talimatname/genel/k/kernel/config +++ b/talimatname/genel/k/kernel/config @@ -1,6 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.17.14-1 Kernel Configuration +# Linux/x86 4.18.11-1 Kernel Configuration +# + +# +# Compiler: gcc (GCC) 5.3.0 # CONFIG_64BIT=y CONFIG_X86_64=y @@ -15,8 +19,6 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=28 CONFIG_ARCH_MMAP_RND_BITS_MAX=32 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y @@ -43,6 +45,9 @@ CONFIG_X86_64_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=4 +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=50300 +CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -51,7 +56,6 @@ CONFIG_THREAD_INFO_IN_TASK=y # General setup # CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set CONFIG_LOCALVERSION="-milis" # CONFIG_LOCALVERSION_AUTO is not set @@ -234,6 +238,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_USERFAULTFD=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_RSEQ=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -256,6 +261,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -284,8 +290,8 @@ CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y CONFIG_HAVE_CLK=y -CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y @@ -303,13 +309,13 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_PLUGIN_HOSTCC="g++" CONFIG_HAVE_GCC_PLUGINS=y # CONFIG_GCC_PLUGINS is not set -CONFIG_HAVE_CC_STACKPROTECTOR=y -# CONFIG_CC_STACKPROTECTOR_NONE is not set -CONFIG_CC_STACKPROTECTOR_REGULAR=y -# CONFIG_CC_STACKPROTECTOR_STRONG is not set -# CONFIG_CC_STACKPROTECTOR_AUTO is not set +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_CC_HAS_STACKPROTECTOR_NONE=y +CONFIG_STACKPROTECTOR=y +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y @@ -333,6 +339,7 @@ CONFIG_HAVE_STACK_VALIDATION=y CONFIG_ISA_BUS_API=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -433,6 +440,7 @@ CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_QUEUED_RWLOCKS=y CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y +CONFIG_CC_HAS_SANE_STACKPROTECTOR=y CONFIG_FREEZER=y # @@ -494,8 +502,6 @@ CONFIG_DMI=y CONFIG_GART_IOMMU=y CONFIG_CALGARY_IOMMU=y CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -CONFIG_SWIOTLB=y -CONFIG_IOMMU_HELPER=y # CONFIG_MAXSMP is not set CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_END=512 @@ -537,8 +543,6 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_X86_5LEVEL is not set -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_X86_DIRECT_GBPAGES=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y # CONFIG_AMD_MEM_ENCRYPT is not set @@ -613,6 +617,7 @@ CONFIG_ARCH_HAS_ZONE_DEVICE=y CONFIG_ZONE_DEVICE=y CONFIG_ARCH_HAS_HMM=y CONFIG_MIGRATE_VMA_HELPER=y +CONFIG_DEV_PAGEMAP_OPS=y CONFIG_HMM=y CONFIG_HMM_MIRROR=y CONFIG_DEVICE_PRIVATE=y @@ -622,6 +627,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y # CONFIG_PERCPU_STATS is not set CONFIG_GUP_BENCHMARK=y +CONFIG_ARCH_HAS_PTE_SPECIAL=y # CONFIG_X86_PMEM_LEGACY is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y @@ -818,8 +824,8 @@ CONFIG_MMCONF_FAM10H=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIEAER=y -# CONFIG_PCIE_ECRC is not set # CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_ECRC is not set CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM_DEFAULT=y @@ -829,13 +835,13 @@ CONFIG_PCIEASPM_DEFAULT=y CONFIG_PCIE_PME=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_PTM is not set -CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_QUIRKS=y # CONFIG_PCI_DEBUG is not set CONFIG_PCI_REALLOC_ENABLE_AUTO=y CONFIG_PCI_STUB=m +CONFIG_PCI_PF_STUB=m CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_PCI_ATS=y CONFIG_PCI_LOCKLESS_CONFIG=y @@ -850,21 +856,24 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_HOTPLUG_PCI_SHPC=y + +# +# PCI controller drivers +# # # Cadence PCIe controllers support # +CONFIG_VMD=m # # DesignWare PCI Core Support # -# CONFIG_PCIE_DW_PLAT is not set - -# -# PCI host controller drivers -# -CONFIG_VMD=m +CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y +CONFIG_PCIE_DW_PLAT=y +CONFIG_PCIE_DW_PLAT_HOST=y # # PCI Endpoint @@ -956,6 +965,7 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set # CONFIG_SMC is not set +CONFIG_XDP_SOCKETS=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y @@ -1047,6 +1057,7 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y CONFIG_IPV6_SEG6_LWTUNNEL=y CONFIG_IPV6_SEG6_HMAC=y +CONFIG_IPV6_SEG6_BPF=y CONFIG_NETLABEL=y CONFIG_NETWORK_SECMARK=y CONFIG_NET_PTP_CLASSIFY=y @@ -1106,21 +1117,18 @@ CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_REDIRECT=m +CONFIG_NF_NAT_REDIRECT=y CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_OSF=m CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_SET=m CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_NETDEV=y -CONFIG_NFT_EXTHDR=m -CONFIG_NFT_META=m -CONFIG_NFT_RT=m # CONFIG_NFT_NUMGEN is not set CONFIG_NFT_CT=m CONFIG_NFT_FLOW_OFFLOAD=m -# CONFIG_NFT_SET_RBTREE is not set -# CONFIG_NFT_SET_HASH is not set -# CONFIG_NFT_SET_BITMAP is not set CONFIG_NFT_COUNTER=m +CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m CONFIG_NFT_MASQ=m @@ -1133,6 +1141,7 @@ CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m CONFIG_NFT_HASH=m +CONFIG_NFT_SOCKET=m CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m @@ -1272,6 +1281,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_DH=m CONFIG_IP_VS_SH=m +CONFIG_IP_VS_MH=m CONFIG_IP_VS_SED=m CONFIG_IP_VS_NQ=m @@ -1280,6 +1290,11 @@ CONFIG_IP_VS_NQ=m # CONFIG_IP_VS_SH_TAB_BITS=8 +# +# IPVS MH scheduler +# +CONFIG_IP_VS_MH_TAB_INDEX=12 + # # IPVS application helper # @@ -1293,6 +1308,7 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_REJECT_IPV4=m @@ -1306,7 +1322,7 @@ CONFIG_NF_LOG_IPV4=m CONFIG_NF_REJECT_IPV4=m CONFIG_NF_NAT_IPV4=m CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=y CONFIG_NFT_MASQ_IPV4=m CONFIG_NFT_REDIR_IPV4=m CONFIG_NF_NAT_SNMP_BASIC=m @@ -1341,6 +1357,7 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m @@ -1354,7 +1371,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=y CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1377,7 +1394,6 @@ CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=y -CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_LOG_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m @@ -1401,6 +1417,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_BPFILTER is not set CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -1701,7 +1718,6 @@ CONFIG_BT_DEBUGFS=y CONFIG_BT_INTEL=m CONFIG_BT_BCM=m CONFIG_BT_RTL=m -CONFIG_BT_QCA=m CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y CONFIG_BT_HCIBTUSB_BCM=y @@ -1713,7 +1729,6 @@ CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y -CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y CONFIG_BT_HCIUART_MRVL=y CONFIG_BT_HCIBCM203X=m @@ -1828,6 +1843,8 @@ CONFIG_DST_CACHE=y CONFIG_GRO_CELLS=y CONFIG_NET_DEVLINK=m CONFIG_MAY_USE_DEVLINK=m +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=m CONFIG_HAVE_EBPF_JIT=y # @@ -1842,6 +1859,10 @@ CONFIG_DEVTMPFS=y # CONFIG_DEVTMPFS_MOUNT is not set CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y + +# +# Firmware loader +# CONFIG_FW_LOADER=y CONFIG_EXTRA_FIRMWARE="amd-ucode/microcode_amd.bin amd-ucode/microcode_amd_fam15h.bin amd-ucode/microcode_amd_fam16h.bin amd-ucode/microcode_amd_fam17h.bin intel-ucode/06-03-02 intel-ucode/06-06-05 intel-ucode/06-08-01 intel-ucode/06-0a-01 intel-ucode/06-0f-02 intel-ucode/06-16-01 intel-ucode/06-1c-02 intel-ucode/06-26-01 intel-ucode/06-3c-03 intel-ucode/06-3f-04 intel-ucode/06-55-04 intel-ucode/06-7a-01 intel-ucode/0f-00-07 intel-ucode/0f-02-07 intel-ucode/0f-04-03 intel-ucode/0f-06-02 intel-ucode/06-05-00 intel-ucode/06-06-0a intel-ucode/06-08-03 intel-ucode/06-0b-01 intel-ucode/06-0f-06 intel-ucode/06-17-06 intel-ucode/06-1c-0a intel-ucode/06-2a-07 intel-ucode/06-2c-02 intel-ucode/06-3d-04 intel-ucode/06-45-01 intel-ucode/06-56-02 intel-ucode/06-8e-09 intel-ucode/0f-00-0a intel-ucode/0f-02-09 intel-ucode/0f-04-04 intel-ucode/0f-06-04 intel-ucode/06-05-01 intel-ucode/06-06-0d intel-ucode/06-08-06 intel-ucode/06-0b-04 intel-ucode/06-0f-07 intel-ucode/06-17-07 intel-ucode/06-1d-01 intel-ucode/06-2d-06 intel-ucode/06-3e-04 intel-ucode/06-46-01 intel-ucode/06-56-03 intel-ucode/06-8e-0a intel-ucode/0f-01-02 intel-ucode/0f-03-02 intel-ucode/0f-04-07 intel-ucode/0f-06-05 intel-ucode/06-05-02 intel-ucode/06-07-01 intel-ucode/06-08-0a intel-ucode/06-0d-06 intel-ucode/06-0f-0a intel-ucode/06-17-0a intel-ucode/06-1e-05 intel-ucode/06-2d-07 intel-ucode/06-2e-06 intel-ucode/06-3e-06 intel-ucode/06-47-01 intel-ucode/06-56-04 intel-ucode/06-9e-09 intel-ucode/0f-02-04 intel-ucode/0f-03-03 intel-ucode/0f-04-08 intel-ucode/0f-06-08 intel-ucode/06-05-03 intel-ucode/06-07-02 intel-ucode/06-09-05 intel-ucode/06-0e-08 intel-ucode/06-0f-0b intel-ucode/06-1a-04 intel-ucode/06-25-02 intel-ucode/06-2f-02 intel-ucode/06-3e-07 intel-ucode/06-4e-03 intel-ucode/06-5c-09 intel-ucode/06-5c-0a intel-ucode/06-5c-02 intel-ucode/06-9e-0a intel-ucode/0f-02-05 intel-ucode/0f-03-04 intel-ucode/0f-04-09 intel-ucode/06-06-00 intel-ucode/06-07-03 intel-ucode/06-0a-00 intel-ucode/06-0e-0c intel-ucode/06-0f-0d intel-ucode/06-1a-05 intel-ucode/06-25-05 intel-ucode/06-3a-09 intel-ucode/06-3f-02 intel-ucode/06-5e-03 intel-ucode/06-5f-01 intel-ucode/06-9e-0b intel-ucode/0f-02-06 intel-ucode/0f-04-01 intel-ucode/0f-04-0a" CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware" @@ -2002,6 +2023,7 @@ CONFIG_CDROM=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m CONFIG_ZRAM_WRITEBACK=y +CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_BLK_DEV_DAC960=m # CONFIG_BLK_DEV_UMEM is not set CONFIG_BLK_DEV_LOOP=m @@ -2424,6 +2446,7 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_CACHE=m CONFIG_DM_CACHE_SMQ=m +CONFIG_DM_WRITECACHE=m CONFIG_DM_ERA=m CONFIG_DM_MIRROR=m CONFIG_DM_LOG_USERSPACE=m @@ -2603,10 +2626,6 @@ CONFIG_ATL1C=m CONFIG_ALX=m CONFIG_NET_VENDOR_AURORA=y CONFIG_AURORA_NB8800=m -CONFIG_NET_CADENCE=y -CONFIG_MACB=m -CONFIG_MACB_USE_HWSTAMP=y -CONFIG_MACB_PCI=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -2623,6 +2642,10 @@ CONFIG_BNXT_SRIOV=y CONFIG_BNXT_FLOWER_OFFLOAD=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m +CONFIG_NET_CADENCE=y +CONFIG_MACB=m +CONFIG_MACB_USE_HWSTAMP=y +CONFIG_MACB_PCI=m # CONFIG_NET_VENDOR_CAVIUM is not set CONFIG_NET_VENDOR_CHELSIO=y CONFIG_CHELSIO_T1=m @@ -2657,16 +2680,13 @@ CONFIG_NET_VENDOR_EMULEX=y CONFIG_BE2NET=m CONFIG_BE2NET_HWMON=y # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_NET_VENDOR_FUJITSU=y CONFIG_PCMCIA_FMVJ18X=m CONFIG_NET_VENDOR_HP=y CONFIG_HP100=m CONFIG_NET_VENDOR_HUAWEI=y CONFIG_HINIC=m +CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_INTEL=y CONFIG_E100=m CONFIG_E1000=m @@ -2685,7 +2705,10 @@ CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_ICE=m CONFIG_FM10K=m -CONFIG_NET_VENDOR_I825XX=y +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y CONFIG_MVMDIO=m @@ -2725,6 +2748,9 @@ CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set CONFIG_ENCX24J600=m CONFIG_LAN743X=m +CONFIG_NET_VENDOR_MICROSEMI=y +CONFIG_MSCC_OCELOT_SWITCH=m +CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2735,6 +2761,7 @@ CONFIG_NS83820=m CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NFP=m # CONFIG_NFP_APP_FLOWER is not set +CONFIG_NFP_APP_ABM_NIC=y # CONFIG_NFP_DEBUG is not set CONFIG_NET_VENDOR_NI=y CONFIG_NET_VENDOR_8390=y @@ -2766,6 +2793,8 @@ CONFIG_QED_OOO=y CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_QCOM_EMAC=m CONFIG_RMNET=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m CONFIG_8139CP=m @@ -2776,18 +2805,11 @@ CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m # CONFIG_NET_VENDOR_RENESAS is not set -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m CONFIG_NET_VENDOR_ROCKER=y CONFIG_ROCKER=m CONFIG_NET_VENDOR_SAMSUNG=y CONFIG_SXGBE_ETH=m CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_SFC=m CONFIG_SFC_MTD=y @@ -2796,6 +2818,11 @@ CONFIG_SFC_SRIOV=y CONFIG_SFC_MCDI_LOGGING=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m @@ -2811,6 +2838,9 @@ CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m CONFIG_CASSINI=m CONFIG_NIU=m +CONFIG_NET_VENDOR_SYNOPSYS=y +CONFIG_DWC_XLGMAC=m +CONFIG_DWC_XLGMAC_PCI=m CONFIG_NET_VENDOR_TEHUTI=y CONFIG_TEHUTI=m CONFIG_NET_VENDOR_TI=y @@ -2829,9 +2859,6 @@ CONFIG_WIZNET_BUS_ANY=y CONFIG_WIZNET_W5100_SPI=m CONFIG_NET_VENDOR_XIRCOM=y CONFIG_PCMCIA_XIRC2PS=m -CONFIG_NET_VENDOR_SYNOPSYS=y -CONFIG_DWC_XLGMAC=m -CONFIG_DWC_XLGMAC_PCI=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_NET_SB1000=m @@ -2840,7 +2867,10 @@ CONFIG_MDIO_BUS=m CONFIG_MDIO_BITBANG=m CONFIG_MDIO_CAVIUM=m # CONFIG_MDIO_GPIO is not set +CONFIG_MDIO_I2C=m +CONFIG_MDIO_MSCC_MIIM=m CONFIG_MDIO_THUNDER=m +CONFIG_PHYLINK=m CONFIG_PHYLIB=m CONFIG_SWPHY=y # CONFIG_LED_TRIGGER_PHY is not set @@ -2848,8 +2878,10 @@ CONFIG_SWPHY=y # # MII PHY device drivers # +CONFIG_SFP=m CONFIG_AMD_PHY=m CONFIG_AQUANTIA_PHY=m +CONFIG_ASIX_PHY=m CONFIG_AT803X_PHY=m CONFIG_BCM7XXX_PHY=m CONFIG_BCM87XX_PHY=m @@ -2859,6 +2891,7 @@ CONFIG_CICADA_PHY=m # CONFIG_CORTINA_PHY is not set CONFIG_DAVICOM_PHY=m CONFIG_DP83822_PHY=m +CONFIG_DP83TC811_PHY=m CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m CONFIG_FIXED_PHY=m @@ -2870,6 +2903,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MARVELL_10G_PHY is not set CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_PHY=m +CONFIG_MICROCHIP_T1_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_NATIONAL_PHY=m CONFIG_QSEMI_PHY=m @@ -2992,6 +3026,7 @@ CONFIG_WIL6210_ISR_COR=y # CONFIG_WIL6210_TRACING is not set CONFIG_WIL6210_DEBUGFS=y CONFIG_ATH10K=m +CONFIG_ATH10K_CE=y CONFIG_ATH10K_PCI=m # CONFIG_ATH10K_SDIO is not set # CONFIG_ATH10K_USB is not set @@ -3235,6 +3270,7 @@ CONFIG_FUJITSU_ES=m CONFIG_THUNDERBOLT_NET=m CONFIG_HYPERV_NET=m CONFIG_NETDEVSIM=m +CONFIG_NET_FAILOVER=m CONFIG_ISDN=y CONFIG_ISDN_I4L=m CONFIG_ISDN_PPP=y @@ -3425,6 +3461,7 @@ CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y CONFIG_MOUSE_PS2_SENTELIC=y CONFIG_MOUSE_PS2_TOUCHKIT=y CONFIG_MOUSE_PS2_FOCALTECH=y @@ -3494,6 +3531,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_CYTTSP_CORE=m CONFIG_TOUCHSCREEN_CYTTSP_I2C=m @@ -3739,7 +3777,6 @@ CONFIG_HVC_XEN_FRONTEND=y CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m CONFIG_IPMI_DMI_DECODE=y -# CONFIG_IPMI_PROC_INTERFACE is not set # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m @@ -3887,6 +3924,7 @@ CONFIG_I2C_SLAVE_EEPROM=m CONFIG_SPI=y # CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y # # SPI Master Controller Drivers @@ -3960,6 +3998,7 @@ CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIO_ACPI=y CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set @@ -4484,6 +4523,7 @@ CONFIG_MFD_WM5110=y # CONFIG_MFD_WM8994 is not set # CONFIG_REGULATOR is not set CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PIN=y CONFIG_RC_CORE=m CONFIG_RC_MAP=m @@ -4546,7 +4586,6 @@ CONFIG_V4L2_FWNODE=m CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m CONFIG_DVB_CORE=m # CONFIG_DVB_MMAP is not set CONFIG_DVB_NET=y @@ -4738,14 +4777,6 @@ CONFIG_VIDEO_SOLO6X10=m CONFIG_VIDEO_TW5864=m CONFIG_VIDEO_TW68=m CONFIG_VIDEO_TW686X=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m # # Media capture/analog TV support @@ -4814,6 +4845,9 @@ CONFIG_VIDEO_IPU3_CIO2=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_VIDEO_CADENCE=y +CONFIG_VIDEO_CADENCE_CSI2RX=m +CONFIG_VIDEO_CADENCE_CSI2TX=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_V4L_MEM2MEM_DRIVERS=y @@ -4834,7 +4868,7 @@ CONFIG_CEC_GPIO=m CONFIG_SMS_SDIO_DRV=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_TEA575X=m -CONFIG_RADIO_SI470X=y +CONFIG_RADIO_SI470X=m CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m CONFIG_RADIO_SI4713=m @@ -5041,6 +5075,7 @@ CONFIG_MEDIA_TUNER_IT913X=m CONFIG_MEDIA_TUNER_R820T=m CONFIG_MEDIA_TUNER_MXL301RF=m CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m # # Multistandard (satellite) frontends @@ -5199,6 +5234,7 @@ CONFIG_DVB_SP2=m # # Tools to develop new frontends # +CONFIG_DVB_DUMMY_FE=m # # Graphics support @@ -5215,7 +5251,7 @@ CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_DP_AUX_CHARDEV=y -# CONFIG_DRM_DEBUG_MM_SELFTEST is not set +# CONFIG_DRM_DEBUG_SELFTEST is not set CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y @@ -5233,6 +5269,7 @@ CONFIG_DRM_SCHED=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_I2C_NXP_TDA9950=m CONFIG_DRM_RADEON=m # CONFIG_DRM_RADEON_USERPTR is not set CONFIG_DRM_AMDGPU=m @@ -5250,7 +5287,6 @@ CONFIG_DRM_AMD_ACP=y # Display Engine Configuration # CONFIG_DRM_AMD_DC=y -CONFIG_DRM_AMD_DC_PRE_VEGA=y CONFIG_DRM_AMD_DC_FBC=y CONFIG_DRM_AMD_DC_DCN1_0=y # CONFIG_DEBUG_KERNEL_DC is not set @@ -5307,6 +5343,8 @@ CONFIG_TINYDRM_MI0283QT=m CONFIG_TINYDRM_REPAPER=m CONFIG_TINYDRM_ST7586=m CONFIG_TINYDRM_ST7735R=m +CONFIG_DRM_XEN=y +CONFIG_DRM_XEN_FRONTEND=m # CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y @@ -5380,7 +5418,6 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_AUO_K190X is not set CONFIG_FB_HYPERV=m # CONFIG_FB_SIMPLE is not set # CONFIG_FB_SM712 is not set @@ -5399,6 +5436,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_AMS369FG06 is not set # CONFIG_LCD_LMS501KF03 is not set # CONFIG_LCD_HX8357 is not set +# CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -5414,6 +5452,7 @@ CONFIG_BACKLIGHT_PCF50633=m # CONFIG_BACKLIGHT_BD6107 is not set # CONFIG_BACKLIGHT_ARCXCNN is not set CONFIG_VGASTATE=m +CONFIG_VIDEOMODE_HELPERS=y CONFIG_HDMI=y # @@ -5659,7 +5698,6 @@ CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m CONFIG_SND_SOC_INTEL_HASWELL=m -CONFIG_SND_SOC_INTEL_BAYTRAIL=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m @@ -5670,8 +5708,6 @@ CONFIG_SND_SOC_INTEL_MACH=y CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m -CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m -CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m @@ -5790,6 +5826,7 @@ CONFIG_SND_SOC_SIGMADSP_I2C=m CONFIG_SND_SOC_SIGMADSP_REGMAP=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set CONFIG_SND_SOC_SPDIF=m +CONFIG_SND_SOC_SSM2305=m # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM2602_I2C is not set CONFIG_SND_SOC_SSM4567=m @@ -5812,6 +5849,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m # CONFIG_SND_SOC_TLV320AIC3X is not set CONFIG_SND_SOC_TS3A227E=m CONFIG_SND_SOC_TSCS42XX=m +CONFIG_SND_SOC_TSCS454=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8524 is not set @@ -5825,6 +5863,7 @@ CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_WM8753 is not set # CONFIG_SND_SOC_WM8770 is not set # CONFIG_SND_SOC_WM8776 is not set +CONFIG_SND_SOC_WM8782=m # CONFIG_SND_SOC_WM8804_I2C is not set # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set @@ -5835,6 +5874,7 @@ CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_WM8985 is not set CONFIG_SND_SOC_ZX_AUD96P22=m CONFIG_SND_SOC_MAX9759=m +CONFIG_SND_SOC_MT6351=m # CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set CONFIG_SND_SOC_NAU8824=m @@ -5845,6 +5885,7 @@ CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_X86=y # CONFIG_HDMI_LPE_AUDIO is not set CONFIG_SND_SYNTH_EMUX=m +CONFIG_SND_XEN_FRONTEND=m CONFIG_AC97_BUS=m # @@ -5911,6 +5952,7 @@ CONFIG_LOGIG940_FF=y CONFIG_LOGIWHEELS_FF=y CONFIG_HID_MAGICMOUSE=m # CONFIG_HID_MAYFLASH is not set +CONFIG_HID_REDRAGON=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m CONFIG_HID_MULTITOUCH=m @@ -5936,6 +5978,7 @@ CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEAM=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m CONFIG_HID_RMI=m @@ -6357,6 +6400,7 @@ CONFIG_LEDS_APU=m CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m CONFIG_LEDS_LM3642=m +CONFIG_LEDS_LM3601X=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set CONFIG_LEDS_GPIO=m @@ -6624,7 +6668,6 @@ CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set CONFIG_DCA=m CONFIG_AUXDISPLAY=y -CONFIG_CHARLCD=m CONFIG_HD44780=m CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 @@ -6633,6 +6676,7 @@ CONFIG_CFAG12864B=m CONFIG_CFAG12864B_RATE=20 CONFIG_IMG_ASCII_LCD=m # CONFIG_PANEL is not set +CONFIG_CHARLCD=m CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV_GENIRQ=m @@ -6706,16 +6750,6 @@ CONFIG_XEN_ACPI=y CONFIG_XEN_SYMS=y CONFIG_XEN_HAVE_VPMU=y CONFIG_STAGING=y -# CONFIG_IPX is not set -CONFIG_NCP_FS=m -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_NLS=y -# CONFIG_NCPFS_EXTRAS is not set CONFIG_PRISM2_USB=m CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set @@ -6831,9 +6865,7 @@ CONFIG_VT6656=m # # Accelerometers # -# CONFIG_ADIS16201 is not set # CONFIG_ADIS16203 is not set -# CONFIG_ADIS16209 is not set # CONFIG_ADIS16240 is not set # @@ -6873,25 +6905,15 @@ CONFIG_VT6656=m # # CONFIG_AD5933 is not set -# -# Light sensors -# -# CONFIG_TSL2x7x is not set - # # Active energy metering IC # -# CONFIG_ADE7753 is not set -# CONFIG_ADE7754 is not set -# CONFIG_ADE7758 is not set -# CONFIG_ADE7759 is not set # CONFIG_ADE7854 is not set # # Resolver to digital converters # # CONFIG_AD2S90 is not set -# CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set # CONFIG_FB_SM750 is not set CONFIG_FB_XGI=m @@ -6912,19 +6934,17 @@ CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_STAGING_MEDIA=y -CONFIG_INTEL_ATOMISP=y -# CONFIG_VIDEO_ATOMISP is not set -# CONFIG_VIDEO_ATOMISP_OV5693 is not set -# CONFIG_VIDEO_ATOMISP_OV2722 is not set -# CONFIG_VIDEO_ATOMISP_GC2235 is not set -# CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER is not set -# CONFIG_VIDEO_ATOMISP_MT9M114 is not set -# CONFIG_VIDEO_ATOMISP_GC0310 is not set -# CONFIG_VIDEO_ATOMISP_OV2680 is not set -# CONFIG_VIDEO_ATOMISP_LM3554 is not set CONFIG_I2C_BCM2048=m CONFIG_SOC_CAMERA_IMX074=m CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m # # Android @@ -6933,12 +6953,6 @@ CONFIG_LTE_GDM724X=m CONFIG_FIREWIRE_SERIAL=m CONFIG_FWTTY_MAX_TOTAL_PORTS=64 CONFIG_FWTTY_MAX_CARD_PORTS=32 -CONFIG_LNET=m -CONFIG_LNET_MAX_PAYLOAD=1048576 -CONFIG_LNET_SELFTEST=m -CONFIG_LNET_XPRT_IB=m -CONFIG_LUSTRE_FS=m -# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set CONFIG_DGNC=m CONFIG_GS_FPGABOOT=m CONFIG_CRYPTO_SKEIN=y @@ -6956,6 +6970,7 @@ CONFIG_WILC1000_SDIO=m # USB Power Delivery and Type-C drivers # CONFIG_TYPEC_TCPCI=m +CONFIG_TYPEC_RT1711H=m # CONFIG_DRM_VBOXVIDEO is not set # CONFIG_PI433 is not set # CONFIG_MTK_MMC is not set @@ -7041,6 +7056,7 @@ CONFIG_PMC_ATOM=y CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_PSTORE=m +# CONFIG_CHROMEOS_TBMC is not set CONFIG_CROS_EC_LPC=m # CONFIG_CROS_EC_LPC_MEC is not set CONFIG_CROS_EC_PROTO=y @@ -7175,6 +7191,8 @@ CONFIG_IIO_SW_TRIGGER=m # # Accelerometers # +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16209 is not set # CONFIG_BMA180 is not set # CONFIG_BMA220 is not set # CONFIG_BMC150_ACCEL is not set @@ -7247,6 +7265,10 @@ CONFIG_AXP288_ADC=m # CONFIG_TI_TLC4541 is not set # CONFIG_VIPERBOARD_ADC is not set +# +# Analog Front Ends +# + # # Amplifiers # @@ -7294,7 +7316,8 @@ CONFIG_IIO_ST_SENSORS_CORE=m # CONFIG_AD5504 is not set # CONFIG_AD5624R_SPI is not set # CONFIG_LTC2632 is not set -# CONFIG_AD5686 is not set +# CONFIG_AD5686_SPI is not set +# CONFIG_AD5696_I2C is not set # CONFIG_AD5755 is not set # CONFIG_AD5761 is not set # CONFIG_AD5764 is not set @@ -7307,6 +7330,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m # CONFIG_MCP4725 is not set # CONFIG_MCP4922 is not set # CONFIG_TI_DAC082S085 is not set +# CONFIG_TI_DAC5571 is not set # # IIO dummy driver @@ -7417,6 +7441,7 @@ CONFIG_ST_UVIS25_SPI=m # CONFIG_TCS3472 is not set # CONFIG_SENSORS_TSL2563 is not set # CONFIG_TSL2583 is not set +# CONFIG_TSL2772 is not set # CONFIG_TSL4531 is not set # CONFIG_US5182D is not set # CONFIG_VCNL4000 is not set @@ -7514,6 +7539,11 @@ CONFIG_ZPA2326_SPI=m # CONFIG_SX9500 is not set # CONFIG_SRF08 is not set +# +# Resolver to digital converters +# +# CONFIG_AD2S1200 is not set + # # Temperature sensors # @@ -7603,6 +7633,7 @@ CONFIG_ALTERA_PR_IP_CORE=m CONFIG_FPGA_MGR_ALTERA_PS_SPI=m CONFIG_FPGA_MGR_ALTERA_CVP=m CONFIG_FPGA_MGR_XILINX_SPI=m +CONFIG_FPGA_MGR_MACHXO2_SPI=m # CONFIG_FPGA_BRIDGE is not set CONFIG_PM_OPP=y CONFIG_UNISYS_VISORBUS=m @@ -7640,6 +7671,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_APPLE_PROPERTIES=y CONFIG_RESET_ATTACK_MITIGATION=y CONFIG_UEFI_CPER=y +CONFIG_UEFI_CPER_X86=y CONFIG_EFI_DEV_PATH_PARSER=y # @@ -7679,6 +7711,7 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y CONFIG_XFS_ONLINE_SCRUB=y +CONFIG_XFS_ONLINE_REPAIR=y # CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m @@ -7728,6 +7761,7 @@ CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y CONFIG_QUOTACTL_COMPAT=y CONFIG_AUTOFS4_FS=y +CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_OVERLAY_FS=m @@ -7755,7 +7789,6 @@ CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems @@ -7776,6 +7809,7 @@ CONFIG_NTFS_RW=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_VMCORE=y +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_PROC_CHILDREN=y @@ -7786,6 +7820,7 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y +CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y CONFIG_EFIVAR_FS=y @@ -8046,6 +8081,7 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y CONFIG_HAVE_ARCH_KASAN=y # CONFIG_KASAN is not set CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_KCOV is not set # CONFIG_DEBUG_SHIRQ is not set @@ -8114,8 +8150,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FAULT_INJECTION is not set CONFIG_FUNCTION_ERROR_INJECTION=y +# CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y @@ -8188,6 +8224,7 @@ CONFIG_TEST_KSTRTOX=m # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_UUID is not set +# CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_PARMAN is not set @@ -8338,6 +8375,19 @@ CONFIG_CRYPTO_ENGINE=m CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=m +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS256=m +CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m +CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m +CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m +CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_MORUS640_GLUE=m +CONFIG_CRYPTO_MORUS640_SSE2=m +CONFIG_CRYPTO_MORUS1280=m +CONFIG_CRYPTO_MORUS1280_GLUE=m +CONFIG_CRYPTO_MORUS1280_SSE2=m +CONFIG_CRYPTO_MORUS1280_AVX2=m CONFIG_CRYPTO_SEQIV=m CONFIG_CRYPTO_ECHAINIV=m @@ -8422,7 +8472,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_X86_64=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20_X86_64=m CONFIG_CRYPTO_SEED=m @@ -8447,6 +8496,7 @@ CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_842=m CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4HC=m +CONFIG_CRYPTO_ZSTD=m # # Random Number Generation @@ -8595,9 +8645,14 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y -CONFIG_SGL_ALLOC=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DMA_DIRECT_OPS=y CONFIG_DMA_VIRT_OPS=y +CONFIG_SWIOTLB=y +CONFIG_SGL_ALLOC=y +CONFIG_IOMMU_HELPER=y CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y CONFIG_DQL=y @@ -8630,6 +8685,7 @@ CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y +CONFIG_ARCH_HAS_UACCESS_MCSAFE=y CONFIG_SBITMAP=y CONFIG_PARMAN=m # CONFIG_STRING_SELFTEST is not set diff --git a/talimatname/genel/k/kernel/kernel.kos-sil b/talimatname/genel/k/kernel/kernel.kos-sil new file mode 100644 index 000000000..b7b10b372 --- /dev/null +++ b/talimatname/genel/k/kernel/kernel.kos-sil @@ -0,0 +1,8 @@ +#!/bin/sh +for _kurtar in \ +'/boot/grub' ; \ +do +# -sz ve -g den sonra /tmp/$paket.sil dikkate alınır +sed -i '\|'\'$_kurtar\''|d' /tmp/kernel.sil + +done diff --git a/talimatname/genel/k/kernel/kernel.kur-kos b/talimatname/genel/k/kernel/kernel.kur-kos index 1e7f71c6e..bdb2f723a 100644 --- a/talimatname/genel/k/kernel/kernel.kur-kos +++ b/talimatname/genel/k/kernel/kernel.kur-kos @@ -1,5 +1,5 @@ #!/bin/bash -surum=4.17.14 +surum=4.18.12 sonek=milis depmod ${surum}-$sonek cd /boot diff --git a/talimatname/genel/k/kernel/talimat b/talimatname/genel/k/kernel/talimat index 164846f0c..47f3c3303 100644 --- a/talimatname/genel/k/kernel/talimat +++ b/talimatname/genel/k/kernel/talimat @@ -5,8 +5,8 @@ # Grup: sistem isim=kernel -_basekernel=4.17 -surum=4.17.14 +_basekernel=4.18 +surum=4.18.12 devir=1 kaynak=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-$_basekernel.tar.xz @@ -61,7 +61,7 @@ derle() { yes "" | make oldconfig >/dev/null # derleme - make ${MAKEFLAGS} bzImage modules || make ${MAKEFLAGS} bzImage modules + make -j1 bzImage modules || make -j1 bzImage modules KARCH=x86 diff --git a/talimatname/genel/k/kernel/tmpfs-idr.patch b/talimatname/genel/k/kernel/tmpfs-idr.patch index 376b96cc8..0f9ab1eb5 100644 --- a/talimatname/genel/k/kernel/tmpfs-idr.patch +++ b/talimatname/genel/k/kernel/tmpfs-idr.patch @@ -1,6 +1,6 @@ SPDX-License-Identifier: GPL-2.0 diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h -index 73b5e65..0185e47 100644 +index f155dc6..ed9ec5b 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -25,10 +25,13 @@ struct shmem_inode_info { @@ -20,7 +20,7 @@ index 73b5e65..0185e47 100644 umode_t mode; /* Mount mode for root directory */ unsigned char huge; /* Whether to try for hugepages */ diff --git a/mm/shmem.c b/mm/shmem.c -index 9d6c7e5..d2f0cc8 100644 +index 41b9bbf..3b4b410 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -111,9 +111,13 @@ static unsigned long shmem_default_max_blocks(void) @@ -39,7 +39,7 @@ index 9d6c7e5..d2f0cc8 100644 } #endif -@@ -1091,6 +1095,11 @@ static void shmem_evict_inode(struct inode *inode) +@@ -1105,6 +1109,11 @@ static void shmem_evict_inode(struct inode *inode) simple_xattrs_free(&info->xattrs); WARN_ON(inode->i_blocks); @@ -51,7 +51,7 @@ index 9d6c7e5..d2f0cc8 100644 shmem_free_inode(inode->i_sb); clear_inode(inode); } -@@ -2162,13 +2171,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode +@@ -2178,13 +2187,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode struct inode *inode; struct shmem_inode_info *info; struct shmem_sb_info *sbinfo = SHMEM_SB(sb); @@ -66,10 +66,10 @@ index 9d6c7e5..d2f0cc8 100644 inode_init_owner(inode, dir, mode); inode->i_blocks = 0; inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); -@@ -2210,6 +2219,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode - mpol_shared_policy_init(&info->policy, NULL); - break; +@@ -2226,6 +2235,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode } + + lockdep_annotate_inode_mutex_key(inode); + + if (!sbinfo->idr_nouse) { + /* inum 0 and 1 are unused */ @@ -92,7 +92,7 @@ index 9d6c7e5..d2f0cc8 100644 } else shmem_free_inode(sb); return inode; -@@ -3423,8 +3451,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) +@@ -3205,8 +3233,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) static int shmem_match(struct inode *ino, void *vfh) { __u32 *fh = vfh; @@ -102,7 +102,7 @@ index 9d6c7e5..d2f0cc8 100644 return ino->i_ino == inum && fh[0] == ino->i_generation; } -@@ -3435,14 +3462,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, +@@ -3226,14 +3253,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, struct dentry *dentry = NULL; u64 inum; @@ -118,9 +118,9 @@ index 9d6c7e5..d2f0cc8 100644 + inum = fid->raw[1]; + inode = ilookup5(sb, inum, shmem_match, fid->raw); if (inode) { - dentry = d_find_alias(inode); + dentry = shmem_find_alias(inode); iput(inode); -@@ -3454,30 +3478,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, +@@ -3245,30 +3269,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len, struct inode *parent) { @@ -154,7 +154,7 @@ index 9d6c7e5..d2f0cc8 100644 return 1; } -@@ -3541,7 +3550,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo, +@@ -3332,7 +3341,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo, goto bad_val; } else if (!strcmp(this_char,"nr_inodes")) { sbinfo->max_inodes = memparse(value, &rest); @@ -163,7 +163,7 @@ index 9d6c7e5..d2f0cc8 100644 goto bad_val; } else if (!strcmp(this_char,"mode")) { if (remount) -@@ -3606,7 +3615,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data) +@@ -3397,7 +3406,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data) { struct shmem_sb_info *sbinfo = SHMEM_SB(sb); struct shmem_sb_info config = *sbinfo; @@ -172,16 +172,7 @@ index 9d6c7e5..d2f0cc8 100644 int error = -EINVAL; config.mpol = NULL; -@@ -3655,7 +3664,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) - seq_printf(seq, ",size=%luk", - sbinfo->max_blocks << (PAGE_SHIFT - 10)); - if (sbinfo->max_inodes != shmem_default_max_inodes()) -- seq_printf(seq, ",nr_inodes=%lu", sbinfo->max_inodes); -+ seq_printf(seq, ",nr_inodes=%d", sbinfo->max_inodes); - if (sbinfo->mode != (S_IRWXUGO | S_ISVTX)) - seq_printf(seq, ",mode=%03ho", sbinfo->mode); - if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID)) -@@ -3766,6 +3775,8 @@ static void shmem_put_super(struct super_block *sb) +@@ -3470,6 +3479,8 @@ static void shmem_put_super(struct super_block *sb) { struct shmem_sb_info *sbinfo = SHMEM_SB(sb); @@ -190,16 +181,16 @@ index 9d6c7e5..d2f0cc8 100644 percpu_counter_destroy(&sbinfo->used_blocks); mpol_put(sbinfo->mpol); kfree(sbinfo); -@@ -3784,6 +3795,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) +@@ -3488,6 +3499,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) if (!sbinfo) return -ENOMEM; + mutex_init(&sbinfo->idr_lock); + idr_init(&sbinfo->idr); - sbinfo->mode = S_IRWXUGO | S_ISVTX; + sbinfo->mode = 0777 | S_ISVTX; sbinfo->uid = current_fsuid(); sbinfo->gid = current_fsgid(); -@@ -3891,6 +3904,15 @@ static void shmem_destroy_inodecache(void) +@@ -3595,6 +3608,15 @@ static void shmem_destroy_inodecache(void) kmem_cache_destroy(shmem_inode_cachep); } @@ -215,7 +206,7 @@ index 9d6c7e5..d2f0cc8 100644 static const struct address_space_operations shmem_aops = { .writepage = shmem_writepage, .set_page_dirty = __set_page_dirty_no_writeback, -@@ -4021,6 +4043,7 @@ int __init shmem_init(void) +@@ -3725,6 +3747,7 @@ int __init shmem_init(void) pr_err("Could not kern_mount tmpfs\n"); goto out1; } diff --git a/talimatname/genel/k/kernel/vfs-ino.patch b/talimatname/genel/k/kernel/vfs-ino.patch index 3a23a6bd2..90cd64b8a 100644 --- a/talimatname/genel/k/kernel/vfs-ino.patch +++ b/talimatname/genel/k/kernel/vfs-ino.patch @@ -1,6 +1,6 @@ SPDX-License-Identifier: GPL-2.0 diff --git a/fs/inode.c b/fs/inode.c -index 3b55391..94924d2 100644 +index 8c86c80..63175ca 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -861,6 +861,8 @@ unsigned int get_next_ino(void)