This commit is contained in:
milisbir 2018-08-17 09:35:48 +03:00
parent 676995ed7a
commit 3d20cbb87f
11 changed files with 2071 additions and 1830 deletions

View File

@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0
aufs4.15 base patch
aufs4.17 base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 845fc25..7dc2813 100644
index 9c125f7..4616bbf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2486,6 +2486,19 @@ F: include/linux/audit.h
@@ -2519,6 +2519,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
@ -26,10 +26,10 @@ index 845fc25..7dc2813 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
W: http://miguelojeda.es/auxdisplay.htm
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index d5fe720..c292afa 100644
index 55cf554..bc965e5 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -691,6 +691,24 @@ static inline int is_loop_device(struct file *file)
@@ -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;
}
@ -55,10 +55,10 @@ index d5fe720..c292afa 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
index 5c7df1d..019f14b 100644
index 2acfc69..ff338e2 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1197,7 +1197,7 @@ enum d_walk_ret {
@@ -1234,7 +1234,7 @@ enum d_walk_ret {
*
* The @enter() and @finish() callbacks are called with d_lock held.
*/
@ -68,7 +68,7 @@ index 5c7df1d..019f14b 100644
void (*finish)(void *))
{
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 0522e28..74c255d 100644
index d737ff0..7550799 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -32,7 +32,7 @@
@ -90,10 +90,10 @@ index 0522e28..74c255d 100644
return error;
diff --git a/fs/inode.c b/fs/inode.c
index 03102d6..517883c 100644
index 3b55391..e0c5255 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1655,7 +1655,7 @@ EXPORT_SYMBOL(generic_update_time);
@@ -1663,7 +1663,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.
*/
@ -103,7 +103,7 @@ index 03102d6..517883c 100644
int (*update_time)(struct inode *, struct timespec *, int);
diff --git a/fs/namespace.c b/fs/namespace.c
index 9d1374a..26ef600 100644
index 5f75969..61129ff 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -846,6 +846,12 @@ static inline int check_mnt(struct mount *mnt)
@ -120,10 +120,10 @@ index 9d1374a..26ef600 100644
* vfsmount lock must be held for write
*/
diff --git a/fs/read_write.c b/fs/read_write.c
index f8547b8..0a5c47b 100644
index c4eabbf..ddd6e67 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -484,6 +484,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
@@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
return -EINVAL;
}
@ -153,7 +153,7 @@ index f8547b8..0a5c47b 100644
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
index 39e2dc0..c5fb195 100644
index 005d09c..f617ab0 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@ -181,7 +181,7 @@ index 39e2dc0..c5fb195 100644
ssize_t (*splice_read)(struct file *, loff_t *,
struct pipe_inode_info *, size_t, unsigned int);
diff --git a/fs/sync.c b/fs/sync.c
index 6e0a2cb..a6891ee 100644
index b54e054..2860782 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -28,7 +28,7 @@
@ -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 511fbaa..96e05b3 100644
index 760d8da..09a2542 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1265,6 +1265,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -1270,6 +1270,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 511fbaa..96e05b3 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);
@@ -1712,6 +1713,7 @@ struct file_operations {
@@ -1724,6 +1725,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 511fbaa..96e05b3 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);
@@ -1782,6 +1784,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
@@ -1794,6 +1796,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
@ -238,7 +238,7 @@ index 511fbaa..96e05b3 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 *);
@@ -2201,6 +2209,7 @@ extern int current_umask(void);
@@ -2199,6 +2207,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);
@ -246,7 +246,7 @@ index 511fbaa..96e05b3 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2481,6 +2490,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
@@ -2485,6 +2494,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
}
#endif
@ -255,7 +255,7 @@ index 511fbaa..96e05b3 100644
extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 3251d9c..0360952 100644
index 6fc77d4..27e76f0 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -313,6 +313,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
@ -267,7 +267,7 @@ index 3251d9c..0360952 100644
/*
* Acquire a lock.
*
@@ -442,6 +444,7 @@ struct lockdep_map { };
@@ -439,6 +441,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0)
@ -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 5216590..8b5f44d 100644
index 0233863..06e0d7a 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];

View File

@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0
aufs4.15 kbuild patch
aufs4.17 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index 7aee6d6..ec92031 100644
index bc821a8..7ae814c 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -248,6 +248,7 @@ source "fs/pstore/Kconfig"
@@ -251,6 +251,7 @@ source "fs/pstore/Kconfig"
source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"
@ -14,10 +14,10 @@ index 7aee6d6..ec92031 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
index ef772f1..51779e68c 100644
index c9375fd..8af5671 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -129,3 +129,4 @@ obj-y += exofs/ # Multiple modules
@@ -128,3 +128,4 @@ obj-y += exofs/ # Multiple modules
obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/
obj-$(CONFIG_EFIVAR_FS) += efivarfs/

View File

@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0
aufs4.15 loopback patch
aufs4.17 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index c292afa..a93038c 100644
index 5678bf8..ec9c4fb 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -600,6 +600,15 @@ static inline void loop_update_dio(struct loop_device *lo)
@@ -626,6 +626,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
@ -21,7 +21,7 @@ index c292afa..a93038c 100644
static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev)
{
@@ -634,6 +643,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -690,6 +699,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
unsigned int arg)
{
struct file *file, *old_file;
@ -29,7 +29,7 @@ index c292afa..a93038c 100644
struct inode *inode;
int error;
@@ -650,9 +660,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -706,6 +716,12 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
file = fget(arg);
if (!file)
goto out;
@ -40,13 +40,17 @@ index c292afa..a93038c 100644
+ get_file(file);
+ }
error = loop_validate_file(file, bdev);
if (error)
@@ -713,6 +729,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
inode = file->f_mapping->host;
old_file = lo->lo_backing_file;
+ old_virt_file = lo->lo_backing_virt_file;
error = -EINVAL;
@@ -667,6 +684,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -724,6 +741,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
lo->lo_backing_file = file;
@ -54,7 +58,7 @@ index c292afa..a93038c 100644
lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
mapping_set_gfp_mask(file->f_mapping,
lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
@@ -674,12 +692,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -731,12 +749,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
blk_mq_unfreeze_queue(lo->lo_queue);
fput(old_file);
@ -71,16 +75,16 @@ index c292afa..a93038c 100644
out:
return error;
}
@@ -873,7 +895,7 @@ static int loop_prepare_queue(struct loop_device *lo)
@@ -924,7 +946,7 @@ static int loop_prepare_queue(struct loop_device *lo)
static int loop_set_fd(struct loop_device *lo, fmode_t mode,
struct block_device *bdev, unsigned int arg)
{
- struct file *file, *f;
- struct file *file;
+ struct file *file, *f, *virt_file = NULL;
struct inode *inode;
struct address_space *mapping;
int lo_flags = 0;
@@ -887,6 +909,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -938,6 +960,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
file = fget(arg);
if (!file)
goto out;
@ -93,7 +97,7 @@ index c292afa..a93038c 100644
error = -EBUSY;
if (lo->lo_state != Lo_unbound)
@@ -935,6 +963,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -970,6 +998,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
@ -101,7 +105,7 @@ index c292afa..a93038c 100644
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
@@ -968,6 +997,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -1003,6 +1032,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
out_putf:
fput(file);
@ -110,7 +114,7 @@ index c292afa..a93038c 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
@@ -1014,6 +1045,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
@@ -1049,6 +1080,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
static int loop_clr_fd(struct loop_device *lo)
{
struct file *filp = lo->lo_backing_file;
@ -118,7 +122,7 @@ index c292afa..a93038c 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
@@ -1045,6 +1077,7 @@ static int loop_clr_fd(struct loop_device *lo)
@@ -1080,6 +1112,7 @@ static int loop_clr_fd(struct loop_device *lo)
spin_lock_irq(&lo->lo_lock);
lo->lo_state = Lo_rundown;
lo->lo_backing_file = NULL;
@ -126,7 +130,7 @@ index c292afa..a93038c 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
@@ -1092,6 +1125,8 @@ static int loop_clr_fd(struct loop_device *lo)
@@ -1128,6 +1161,8 @@ static int loop_clr_fd(struct loop_device *lo)
* bd_mutex which is usually taken before lo_ctl_mutex.
*/
fput(filp);
@ -136,7 +140,7 @@ index c292afa..a93038c 100644
}
diff --git a/drivers/block/loop.h b/drivers/block/loop.h
index 0f45416..101f193 100644
index 4d42c7a..a4974ee 100644
--- a/drivers/block/loop.h
+++ b/drivers/block/loop.h
@@ -46,7 +46,7 @@ struct loop_device {
@ -149,7 +153,7 @@ index 0f45416..101f193 100644
void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
index 0d4ea929..af293c2 100644
index 7ca7f67..3d4e90d 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)
@ -162,7 +166,7 @@ index 0d4ea929..af293c2 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 3b217c2..0f5ab22 100644
index 2d65b8f..5ed7903 100644
--- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void)
@ -186,7 +190,7 @@ index 3b217c2..0f5ab22 100644
+ return f;
+}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
index 7d7bf34..ba7c188 100644
index 05d703d..6bb23c8 100644
--- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h
@@ -26,7 +26,11 @@ void au_warn_loopback(struct super_block *h_sb);
@ -211,10 +215,10 @@ index 7d7bf34..ba7c188 100644
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
index 357bf04..c6614df 100644
index eed37ba..a3a5cd7 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
@@ -839,7 +839,10 @@ static const struct super_operations aufs_sop = {
@@ -840,7 +840,10 @@ static const struct super_operations aufs_sop = {
.statfs = aufs_statfs,
.put_super = aufs_put_super,
.sync_fs = aufs_sync_fs,
@ -227,10 +231,10 @@ index 357bf04..c6614df 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 96e05b3..ba5e627 100644
index 3a9d5b4..50a30c2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1840,6 +1840,10 @@ struct super_operations {
@@ -1861,6 +1861,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);

View File

@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0
aufs4.15 mmap patch
aufs4.17 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 60316b5..ce5314e 100644
index 1a76d75..77f698e 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1987,7 +1987,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
@@ -2024,7 +2024,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) {
@ -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 339e4c1..1138098 100644
index c486ad4..76b71f8 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -306,7 +306,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
@@ -305,7 +305,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 339e4c1..1138098 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1736,7 +1739,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
@@ -1726,7 +1729,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,12 +72,12 @@ 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 ea818ff..fbd4799 100644
index 02a616e..01b3bb9 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1362,6 +1362,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
@@ -1380,6 +1380,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
#endif
+extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
+extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
@ -101,14 +101,14 @@ index ea818ff..fbd4799 100644
+#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__)
+#endif /* !CONFIG_MMU */
+
extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len,
unsigned int gup_flags);
extern int access_process_vm(struct task_struct *tsk, unsigned long addr,
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 cfd0ac4..135e11c 100644
index 2161234..78aa367 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -255,6 +255,7 @@ struct vm_region {
@@ -251,6 +251,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 cfd0ac4..135e11c 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
@@ -329,6 +330,7 @@ struct vm_area_struct {
@@ -325,6 +326,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 cfd0ac4..135e11c 100644
atomic_long_t swap_readahead_info;
diff --git a/kernel/fork.c b/kernel/fork.c
index 2295fc6..80e1fee 100644
index a5d21c4..e965e09 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -676,7 +676,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -473,7 +473,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,12 +138,12 @@ index 2295fc6..80e1fee 100644
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
index e669f02..9c36567 100644
index b4e54a9a..77892ae 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o \
mm_init.o mmu_context.o percpu.o slab_common.o \
compaction.o vmacache.o swap_slots.o \
compaction.o vmacache.o \
interval_tree.o list_lru.o workingset.o \
- debug.o $(mmu-y)
+ prfile.o debug.o $(mmu-y)
@ -151,10 +151,10 @@ index e669f02..9c36567 100644
obj-y += init-mm.o
diff --git a/mm/filemap.c b/mm/filemap.c
index ee83baa..7677d13 100644
index 0604cb0..45d2369 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2704,7 +2704,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
@@ -2700,7 +2700,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
int ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
@ -164,10 +164,10 @@ index ee83baa..7677d13 100644
if (page->mapping != inode->i_mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
index 9efdc021..d77f01f 100644
index fc41c05..e376869 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -171,7 +171,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
@ -176,7 +176,7 @@ index 9efdc021..d77f01f 100644
mpol_put(vma_policy(vma));
kmem_cache_free(vm_area_cachep, vma);
return next;
@@ -896,7 +896,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
@@ -905,7 +905,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
if (remove_next) {
if (file) {
uprobe_munmap(next, next->vm_start, next->vm_end);
@ -185,7 +185,7 @@ index 9efdc021..d77f01f 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
@@ -1761,8 +1761,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
@@ -1820,8 +1820,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
@ -195,7 +195,7 @@ index 9efdc021..d77f01f 100644
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
@@ -2586,7 +2586,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2645,7 +2645,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 9efdc021..d77f01f 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2605,7 +2605,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2664,7 +2664,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,7 +213,7 @@ index 9efdc021..d77f01f 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
@@ -2767,7 +2767,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2826,7 +2826,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;
@ -222,7 +222,7 @@ index 9efdc021..d77f01f 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
current->comm, current->pid);
@@ -2842,10 +2842,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2901,10 +2901,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}
@ -251,7 +251,7 @@ index 9efdc021..d77f01f 100644
out:
up_write(&mm->mmap_sem);
if (populate)
@@ -3153,7 +3170,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
@@ -3220,7 +3237,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,10 +261,10 @@ index 9efdc021..d77f01f 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 17c00d9..4bcdf94 100644
index 1372373..6362dde 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -641,7 +641,7 @@ static void __put_nommu_region(struct vm_region *region)
@@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
@ -273,7 +273,7 @@ index 17c00d9..4bcdf94 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
@@ -799,7 +799,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
@@ -767,7 +767,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
@ -282,7 +282,7 @@ index 17c00d9..4bcdf94 100644
put_nommu_region(vma->vm_region);
kmem_cache_free(vm_area_cachep, vma);
}
@@ -1321,7 +1321,7 @@ unsigned long do_mmap(struct file *file,
@@ -1289,7 +1289,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
@ -291,7 +291,7 @@ index 17c00d9..4bcdf94 100644
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
@@ -1396,10 +1396,10 @@ unsigned long do_mmap(struct file *file,
@@ -1364,10 +1364,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
@ -306,19 +306,19 @@ index 17c00d9..4bcdf94 100644
diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644
index 0000000..3f56669
index 0000000..a27ac36
--- /dev/null
+++ b/mm/prfile.c
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * SPDX-License-Identifier: GPL-2.0
+ * Mainly for aufs which mmap(2) different file and wants to print different
+ * path in /proc/PID/maps.
+ * Call these functions via macros defined in linux/mm.h.
+ *
+ * See Documentation/filesystems/aufs/design/06mmap.txt
+ *
+ * Copyright (c) 2014-2017 Junjro R. Okajima
+ * Copyright (c) 2014-2018 Junjro R. Okajima
+ * Copyright (c) 2014 Ian Campbell
+ */
+

View File

@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0
aufs4.15 standalone patch
aufs4.17 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
index 019f14b..10c1a6d 100644
index ff338e2..3e2bae8 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1305,6 +1305,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -1342,6 +1342,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
@ -13,7 +13,7 @@ index 019f14b..10c1a6d 100644
struct check_mount {
struct vfsmount *mnt;
@@ -2892,6 +2893,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
@@ -2942,6 +2943,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
@ -22,7 +22,7 @@ index 019f14b..10c1a6d 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
index 7eb8d21..56d7985 100644
index 183059c..35adee4 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 7eb8d21..56d7985 100644
#ifdef CONFIG_USELIB
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 74c255d..ec53ee1 100644
index 7550799..d403576 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
@ -46,10 +46,10 @@ index 74c255d..ec53ee1 100644
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force)
diff --git a/fs/file_table.c b/fs/file_table.c
index 2dc9f38..7bf57df 100644
index 7ec0b3e..819ee07 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -148,6 +148,7 @@ struct file *get_empty_filp(void)
@@ -147,6 +147,7 @@ struct file *get_empty_filp(void)
}
return ERR_PTR(-ENFILE);
}
@ -57,7 +57,7 @@ index 2dc9f38..7bf57df 100644
/**
* alloc_file - allocate and initialize a 'struct file'
@@ -258,6 +259,7 @@ void flush_delayed_fput(void)
@@ -257,6 +258,7 @@ void flush_delayed_fput(void)
{
delayed_fput(NULL);
}
@ -65,7 +65,7 @@ index 2dc9f38..7bf57df 100644
static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
@@ -300,6 +302,7 @@ void __fput_sync(struct file *file)
@@ -299,6 +301,7 @@ void __fput_sync(struct file *file)
}
EXPORT_SYMBOL(fput);
@ -73,7 +73,7 @@ index 2dc9f38..7bf57df 100644
void put_filp(struct file *file)
{
@@ -308,6 +311,7 @@ void put_filp(struct file *file)
@@ -307,6 +310,7 @@ void put_filp(struct file *file)
file_free(file);
}
}
@ -82,10 +82,10 @@ index 2dc9f38..7bf57df 100644
void __init files_init(void)
{
diff --git a/fs/inode.c b/fs/inode.c
index 517883c..5cece5e 100644
index e0c5255..ff36056 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1664,6 +1664,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
@@ -1672,6 +1672,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
return update_time(inode, time, flags);
}
@ -94,7 +94,7 @@ index 517883c..5cece5e 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index 26ef600..a4b9707 100644
index 61129ff..5d3e0382 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@ -113,7 +113,7 @@ index 26ef600..a4b9707 100644
/*
* vfsmount lock must be held for write
@@ -1887,6 +1889,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
@@ -1893,6 +1895,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
@ -194,7 +194,7 @@ index e9191b4..1f8ccfa 100644
/*
* Destroy all marks in destroy_list, waits for SRCU period to finish before
diff --git a/fs/open.c b/fs/open.c
index 7ea1184..6e2e241 100644
index d0e955b..527bc1a 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@ -205,19 +205,19 @@ index 7ea1184..6e2e241 100644
long vfs_truncate(const struct path *path, loff_t length)
{
@@ -691,6 +692,7 @@ int open_check_o_direct(struct file *f)
}
return 0;
@@ -723,6 +724,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group)
{
return ksys_fchown(fd, user, group);
}
+EXPORT_SYMBOL_GPL(open_check_o_direct);
static int do_dentry_open(struct file *f,
struct inode *inode,
int open_check_o_direct(struct file *f)
{
diff --git a/fs/read_write.c b/fs/read_write.c
index 0a5c47b..d423a5f 100644
index ddd6e67..aabf92d 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -454,6 +454,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
return ret;
}
@ -225,7 +225,7 @@ index 0a5c47b..d423a5f 100644
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
{
@@ -494,6 +495,7 @@ vfs_readf_t vfs_readf(struct file *file)
@@ -499,6 +500,7 @@ vfs_readf_t vfs_readf(struct file *file)
return new_sync_read;
return ERR_PTR(-ENOSYS);
}
@ -233,7 +233,7 @@ index 0a5c47b..d423a5f 100644
vfs_writef_t vfs_writef(struct file *file)
{
@@ -505,6 +507,7 @@ vfs_writef_t vfs_writef(struct file *file)
@@ -510,6 +512,7 @@ vfs_writef_t vfs_writef(struct file *file)
return new_sync_write;
return ERR_PTR(-ENOSYS);
}
@ -241,7 +241,7 @@ index 0a5c47b..d423a5f 100644
ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
{
@@ -574,6 +577,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
@@ -579,6 +582,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
return ret;
}
@ -250,7 +250,7 @@ index 0a5c47b..d423a5f 100644
static inline loff_t file_pos_read(struct file *file)
{
diff --git a/fs/splice.c b/fs/splice.c
index c5fb195..ce01a74 100644
index f617ab0..ec0ad02 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,
@ -270,7 +270,7 @@ index c5fb195..ce01a74 100644
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/fs/sync.c b/fs/sync.c
index a6891ee..47a78bd 100644
index 2860782..ffd7ea4 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
@ -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 8b5f44d..979db63 100644
index 06e0d7a..6af91bd 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 48620c9..4981104 100644
index 1ce701f..a0d106e 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -1330,12 +1330,14 @@ int cap_mmap_addr(unsigned long addr)
@@ -1332,12 +1332,14 @@ int cap_mmap_addr(unsigned long addr)
}
return ret;
}
@ -351,10 +351,10 @@ index c65b39b..e363d22 100644
}
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c
index 1cd8526..f2e4736 100644
index 7bc2fde..6bd0468 100644
--- a/security/security.c
+++ b/security/security.c
@@ -531,6 +531,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -537,6 +537,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
@ -362,7 +362,7 @@ index 1cd8526..f2e4736 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
@@ -547,6 +548,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
@@ -553,6 +554,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name);
}
@ -370,7 +370,7 @@ index 1cd8526..f2e4736 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
@@ -555,6 +557,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
@@ -561,6 +563,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
}
@ -378,7 +378,7 @@ index 1cd8526..f2e4736 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
@@ -582,6 +585,7 @@ int security_path_truncate(const struct path *path)
@@ -588,6 +591,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
@ -386,7 +386,7 @@ index 1cd8526..f2e4736 100644
int security_path_chmod(const struct path *path, umode_t mode)
{
@@ -589,6 +593,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
@@ -595,6 +599,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
@ -394,7 +394,7 @@ index 1cd8526..f2e4736 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
@@ -596,6 +601,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
@@ -602,6 +607,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0;
return call_int_hook(path_chown, 0, path, uid, gid);
}
@ -402,7 +402,7 @@ index 1cd8526..f2e4736 100644
int security_path_chroot(const struct path *path)
{
@@ -681,6 +687,7 @@ int security_inode_readlink(struct dentry *dentry)
@@ -687,6 +693,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0;
return call_int_hook(inode_readlink, 0, dentry);
}
@ -410,7 +410,7 @@ index 1cd8526..f2e4736 100644
int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
bool rcu)
@@ -696,6 +703,7 @@ int security_inode_permission(struct inode *inode, int mask)
@@ -702,6 +709,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
@ -418,7 +418,7 @@ index 1cd8526..f2e4736 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
@@ -867,6 +875,7 @@ int security_file_permission(struct file *file, int mask)
@@ -873,6 +881,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
@ -426,7 +426,7 @@ index 1cd8526..f2e4736 100644
int security_file_alloc(struct file *file)
{
@@ -926,6 +935,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
@@ -932,6 +941,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
return ret;
return ima_file_mmap(file, prot);
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
#!/bin/bash
surum=4.15.7
surum=4.17.14
sonek=milis
depmod ${surum}-$sonek
cd /boot

View File

@ -1,12 +1,12 @@
# Tanım: Kararli kernel sürümü
# URL: http://www.kernel.org
# Paketçi: milisarge
# Gerekler: linux-firmware intel-ucode
# Gerekler: linux-firmware intel-ucode elfutils
# Grup: sistem
isim=kernel
_basekernel=4.15
surum=4.15.7
_basekernel=4.17
surum=4.17.14
devir=1
kaynak=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-$_basekernel.tar.xz
@ -74,7 +74,7 @@ derle() {
cp arch/$KARCH/boot/bzImage "${PKG}/boot/kernel-${surum}"
# vmlinux un source a eklenmesi,modül derlerken bu geçici silinecek
install -D -m644 vmlinux "${PKG}/usr/src/linux-${_kernver}/vmlinux"
#install -D -m644 vmlinux "${PKG}/usr/src/linux-${_kernver}/vmlinux"
# derleme kalıntılarının temizlenmesi
rm -f "${PKG}"/lib/modules/${_kernver}/{source,build}
@ -160,8 +160,8 @@ derle() {
cp net/mac80211/*.h "${PKG}/usr/src/linux-${_kernver}/net/mac80211/"
# add dvb headers for external modules
mkdir -p "${PKG}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
cp drivers/media/dvb-core/*.h "${PKG}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
#mkdir -p "${PKG}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
#cp drivers/media/dvb-core/*.h "${PKG}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
# and...
mkdir -p "${PKG}/usr/src/linux-${_kernver}/include/config/dvb/"
cp include/config/dvb/*.h "${PKG}/usr/src/linux-${_kernver}/include/config/dvb/"
@ -208,6 +208,9 @@ derle() {
esac
done
# add objtool, nvidia needed
install -Dt "${PKG}/usr/src/linux-${_kernver}/tools/objtool" tools/objtool/objtool
# remove unneeded architectures
rm -rf "${PKG}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
}

View File

@ -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 06b295b..45e4de6 100644
index 73b5e65..0185e47 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 06b295b..45e4de6 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 7fbe67b..f6695c1 100644
index 9d6c7e5..d2f0cc8 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 7fbe67b..f6695c1 100644
}
#endif
@@ -1082,6 +1086,11 @@ static void shmem_evict_inode(struct inode *inode)
@@ -1091,6 +1095,11 @@ static void shmem_evict_inode(struct inode *inode)
simple_xattrs_free(&info->xattrs);
WARN_ON(inode->i_blocks);
@ -51,7 +51,7 @@ index 7fbe67b..f6695c1 100644
shmem_free_inode(inode->i_sb);
clear_inode(inode);
}
@@ -2150,13 +2159,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
@@ -2162,13 +2171,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,7 +66,7 @@ index 7fbe67b..f6695c1 100644
inode_init_owner(inode, dir, mode);
inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
@@ -2198,6 +2207,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct 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;
}
@ -92,7 +92,7 @@ index 7fbe67b..f6695c1 100644
} else
shmem_free_inode(sb);
return inode;
@@ -3397,8 +3425,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
@@ -3423,8 +3451,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 7fbe67b..f6695c1 100644
return ino->i_ino == inum && fh[0] == ino->i_generation;
}
@@ -3409,14 +3436,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3435,14 +3462,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL;
u64 inum;
@ -120,7 +120,7 @@ index 7fbe67b..f6695c1 100644
if (inode) {
dentry = d_find_alias(inode);
iput(inode);
@@ -3428,30 +3452,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3454,30 +3478,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 7fbe67b..f6695c1 100644
return 1;
}
@@ -3515,7 +3524,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
@@ -3541,7 +3550,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 7fbe67b..f6695c1 100644
goto bad_val;
} else if (!strcmp(this_char,"mode")) {
if (remount)
@@ -3580,7 +3589,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
@@ -3606,7 +3615,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,7 +172,7 @@ index 7fbe67b..f6695c1 100644
int error = -EINVAL;
config.mpol = NULL;
@@ -3629,7 +3638,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
@@ -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())
@ -181,7 +181,7 @@ index 7fbe67b..f6695c1 100644
if (sbinfo->mode != (S_IRWXUGO | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3747,6 +3756,8 @@ static void shmem_put_super(struct super_block *sb)
@@ -3766,6 +3775,8 @@ static void shmem_put_super(struct super_block *sb)
{
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
@ -190,7 +190,7 @@ index 7fbe67b..f6695c1 100644
percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol);
kfree(sbinfo);
@@ -3765,6 +3776,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
@@ -3784,6 +3795,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
if (!sbinfo)
return -ENOMEM;
@ -199,7 +199,7 @@ index 7fbe67b..f6695c1 100644
sbinfo->mode = S_IRWXUGO | S_ISVTX;
sbinfo->uid = current_fsuid();
sbinfo->gid = current_fsgid();
@@ -3872,6 +3885,15 @@ static void shmem_destroy_inodecache(void)
@@ -3891,6 +3904,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep);
}
@ -215,7 +215,7 @@ index 7fbe67b..f6695c1 100644
static const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback,
@@ -4002,6 +4024,7 @@ int __init shmem_init(void)
@@ -4021,6 +4043,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n");
goto out1;
}

View File

@ -1,9 +1,9 @@
SPDX-License-Identifier: GPL-2.0
diff --git a/fs/inode.c b/fs/inode.c
index 03102d6..a0b03c7 100644
index 3b55391..94924d2 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -856,6 +856,8 @@ unsigned int get_next_ino(void)
@@ -861,6 +861,8 @@ unsigned int get_next_ino(void)
unsigned int *p = &get_cpu_var(last_ino);
unsigned int res = *p;
@ -12,7 +12,7 @@ index 03102d6..a0b03c7 100644
#ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
static atomic_t shared_last_ino;
@@ -868,7 +870,7 @@ unsigned int get_next_ino(void)
@@ -873,7 +875,7 @@ unsigned int get_next_ino(void)
res++;
/* get_next_ino should not provide a 0 inode number */
if (unlikely(!res))