kernel-4.19.2-guncellendi
This commit is contained in:
parent
1d1848a2a4
commit
73ecfb183c
|
@ -1,11 +1,11 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.18 base patch
|
||||
aufs4.19 base patch
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 544cac8..aaa1c7a 100644
|
||||
index b2f710e..d211619 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -2541,6 +2541,19 @@ F: include/linux/audit.h
|
||||
@@ -2605,6 +2605,19 @@ F: include/linux/audit.h
|
||||
F: include/uapi/linux/audit.h
|
||||
F: kernel/audit*
|
||||
|
||||
|
@ -26,10 +26,10 @@ index 544cac8..aaa1c7a 100644
|
|||
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
|
||||
S: Maintained
|
||||
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
|
||||
index 4cb1d1b..5678bf8 100644
|
||||
index ea9debf..9e534a3 100644
|
||||
--- a/drivers/block/loop.c
|
||||
+++ b/drivers/block/loop.c
|
||||
@@ -741,6 +741,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
|
||||
@@ -739,6 +739,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
|
||||
return error;
|
||||
}
|
||||
|
||||
|
@ -55,10 +55,10 @@ index 4cb1d1b..5678bf8 100644
|
|||
|
||||
static ssize_t loop_attr_show(struct device *dev, char *page,
|
||||
diff --git a/fs/dcache.c b/fs/dcache.c
|
||||
index ceb7b49..88a1514 100644
|
||||
index 2e7e8d8..9f57bd8 100644
|
||||
--- a/fs/dcache.c
|
||||
+++ b/fs/dcache.c
|
||||
@@ -1237,7 +1237,7 @@ enum d_walk_ret {
|
||||
@@ -1238,7 +1238,7 @@ enum d_walk_ret {
|
||||
*
|
||||
* The @enter() callbacks are called with d_lock held.
|
||||
*/
|
||||
|
@ -68,7 +68,7 @@ index ceb7b49..88a1514 100644
|
|||
{
|
||||
struct dentry *this_parent;
|
||||
diff --git a/fs/fcntl.c b/fs/fcntl.c
|
||||
index 12273b6..545e686 100644
|
||||
index 4137d96..c91b3e3 100644
|
||||
--- a/fs/fcntl.c
|
||||
+++ b/fs/fcntl.c
|
||||
@@ -32,7 +32,7 @@
|
||||
|
@ -90,10 +90,10 @@ index 12273b6..545e686 100644
|
|||
return error;
|
||||
|
||||
diff --git a/fs/inode.c b/fs/inode.c
|
||||
index 8c86c80..af894e7 100644
|
||||
index 42f6d25..fa6ae6a 100644
|
||||
--- a/fs/inode.c
|
||||
+++ b/fs/inode.c
|
||||
@@ -1649,7 +1649,7 @@ EXPORT_SYMBOL(generic_update_time);
|
||||
@@ -1657,7 +1657,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,10 +103,10 @@ index 8c86c80..af894e7 100644
|
|||
int (*update_time)(struct inode *, struct timespec64 *, int);
|
||||
|
||||
diff --git a/fs/namespace.c b/fs/namespace.c
|
||||
index bd2f4c6..eb7cd21 100644
|
||||
index 9918655..72c93f3 100644
|
||||
--- a/fs/namespace.c
|
||||
+++ b/fs/namespace.c
|
||||
@@ -855,6 +855,12 @@ static inline int check_mnt(struct mount *mnt)
|
||||
@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
|
||||
return mnt->mnt_ns == current->nsproxy->mnt_ns;
|
||||
}
|
||||
|
||||
|
@ -120,7 +120,7 @@ index bd2f4c6..eb7cd21 100644
|
|||
* vfsmount lock must be held for write
|
||||
*/
|
||||
diff --git a/fs/read_write.c b/fs/read_write.c
|
||||
index 153f8f6..ccc5bc8 100644
|
||||
index 8a2737f..42f64cc 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,
|
||||
|
@ -193,23 +193,11 @@ index b54e054..2860782 100644
|
|||
{
|
||||
if (wait)
|
||||
sync_inodes_sb(sb);
|
||||
diff --git a/include/linux/file.h b/include/linux/file.h
|
||||
index 279720d..76e38ea 100644
|
||||
--- a/include/linux/file.h
|
||||
+++ b/include/linux/file.h
|
||||
@@ -20,6 +20,7 @@ struct dentry;
|
||||
struct path;
|
||||
extern struct file *alloc_file(const struct path *, fmode_t mode,
|
||||
const struct file_operations *fop);
|
||||
+extern struct file *get_empty_filp(void);
|
||||
|
||||
static inline void fput_light(struct file *file, int fput_needed)
|
||||
{
|
||||
diff --git a/include/linux/fs.h b/include/linux/fs.h
|
||||
index 805bf22..0d0d247f 100644
|
||||
index 897eae8..7fb92a9 100644
|
||||
--- a/include/linux/fs.h
|
||||
+++ b/include/linux/fs.h
|
||||
@@ -1273,6 +1273,7 @@ extern void fasync_free(struct fasync_struct *);
|
||||
@@ -1286,6 +1286,7 @@ extern void fasync_free(struct fasync_struct *);
|
||||
/* can be called from interrupts */
|
||||
extern void kill_fasync(struct fasync_struct **, int, int);
|
||||
|
||||
|
@ -217,7 +205,7 @@ index 805bf22..0d0d247f 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);
|
||||
@@ -1733,6 +1734,7 @@ struct file_operations {
|
||||
@@ -1747,6 +1748,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 +213,7 @@ index 805bf22..0d0d247f 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);
|
||||
@@ -1803,6 +1805,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
|
||||
@@ -1818,6 +1820,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
|
||||
struct iovec *fast_pointer,
|
||||
struct iovec **ret_pointer);
|
||||
|
||||
|
@ -238,7 +226,7 @@ index 805bf22..0d0d247f 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 *);
|
||||
@@ -2218,6 +2226,7 @@ extern int current_umask(void);
|
||||
@@ -2243,6 +2251,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 timespec64 *, int);
|
||||
|
@ -246,7 +234,7 @@ index 805bf22..0d0d247f 100644
|
|||
|
||||
/* /sys/fs */
|
||||
extern struct kobject *fs_kobj;
|
||||
@@ -2505,6 +2514,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
|
||||
@@ -2530,6 +2539,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
@ -255,7 +243,7 @@ index 805bf22..0d0d247f 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 6fc77d4..27e76f0 100644
|
||||
index b0d0b51..f73ffaa 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,
|
||||
|
@ -310,7 +298,7 @@ index 74b4911..19789fb 100644
|
|||
+ unsigned int flags);
|
||||
#endif
|
||||
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
|
||||
index 5fa4d31..720f070 100644
|
||||
index dd13f86..fa6f559 100644
|
||||
--- a/kernel/locking/lockdep.c
|
||||
+++ b/kernel/locking/lockdep.c
|
||||
@@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.18 kbuild patch
|
||||
aufs4.19 kbuild patch
|
||||
|
||||
diff --git a/fs/Kconfig b/fs/Kconfig
|
||||
index ac474a6..284cee9 100644
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.18 loopback patch
|
||||
aufs4.19 loopback patch
|
||||
|
||||
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
|
||||
index 5678bf8..ec9c4fb 100644
|
||||
index 9e534a3..74cd74e 100644
|
||||
--- a/drivers/block/loop.c
|
||||
+++ b/drivers/block/loop.c
|
||||
@@ -626,6 +626,15 @@ static inline void loop_update_dio(struct loop_device *lo)
|
||||
|
@ -26,10 +26,10 @@ index 5678bf8..ec9c4fb 100644
|
|||
{
|
||||
struct file *file, *old_file;
|
||||
+ struct file *f, *virt_file = NULL, *old_virt_file;
|
||||
struct inode *inode;
|
||||
int error;
|
||||
|
||||
@@ -706,6 +716,12 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
|
||||
error = -ENXIO;
|
||||
@@ -705,12 +715,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
|
||||
file = fget(arg);
|
||||
if (!file)
|
||||
goto out;
|
||||
|
@ -42,15 +42,14 @@ index 5678bf8..ec9c4fb 100644
|
|||
|
||||
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,
|
||||
goto out_putf;
|
||||
|
||||
inode = file->f_mapping->host;
|
||||
old_file = lo->lo_backing_file;
|
||||
+ old_virt_file = lo->lo_backing_virt_file;
|
||||
|
||||
error = -EINVAL;
|
||||
|
||||
@@ -724,6 +741,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
|
||||
@@ -722,6 +739,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;
|
||||
|
@ -58,7 +57,7 @@ index 5678bf8..ec9c4fb 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));
|
||||
@@ -731,12 +749,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
|
||||
@@ -729,12 +747,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
|
||||
blk_mq_unfreeze_queue(lo->lo_queue);
|
||||
|
||||
fput(old_file);
|
||||
|
@ -75,7 +74,7 @@ index 5678bf8..ec9c4fb 100644
|
|||
out:
|
||||
return error;
|
||||
}
|
||||
@@ -924,7 +946,7 @@ static int loop_prepare_queue(struct loop_device *lo)
|
||||
@@ -922,7 +944,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)
|
||||
{
|
||||
|
@ -84,7 +83,7 @@ index 5678bf8..ec9c4fb 100644
|
|||
struct inode *inode;
|
||||
struct address_space *mapping;
|
||||
int lo_flags = 0;
|
||||
@@ -938,6 +960,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
|
||||
@@ -936,6 +958,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
|
||||
file = fget(arg);
|
||||
if (!file)
|
||||
goto out;
|
||||
|
@ -97,7 +96,7 @@ index 5678bf8..ec9c4fb 100644
|
|||
|
||||
error = -EBUSY;
|
||||
if (lo->lo_state != Lo_unbound)
|
||||
@@ -970,6 +998,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
|
||||
@@ -968,6 +996,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;
|
||||
|
@ -105,7 +104,7 @@ index 5678bf8..ec9c4fb 100644
|
|||
lo->transfer = NULL;
|
||||
lo->ioctl = NULL;
|
||||
lo->lo_sizelimit = 0;
|
||||
@@ -1003,6 +1032,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
|
||||
@@ -1001,6 +1030,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
|
||||
|
||||
out_putf:
|
||||
fput(file);
|
||||
|
@ -114,7 +113,7 @@ index 5678bf8..ec9c4fb 100644
|
|||
out:
|
||||
/* This is safe: open() is still holding a reference. */
|
||||
module_put(THIS_MODULE);
|
||||
@@ -1049,6 +1080,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
|
||||
@@ -1047,6 +1078,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;
|
||||
|
@ -122,7 +121,7 @@ index 5678bf8..ec9c4fb 100644
|
|||
gfp_t gfp = lo->old_gfp_mask;
|
||||
struct block_device *bdev = lo->lo_device;
|
||||
|
||||
@@ -1080,6 +1112,7 @@ static int loop_clr_fd(struct loop_device *lo)
|
||||
@@ -1078,6 +1110,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;
|
||||
|
@ -130,7 +129,7 @@ index 5678bf8..ec9c4fb 100644
|
|||
spin_unlock_irq(&lo->lo_lock);
|
||||
|
||||
loop_release_xfer(lo);
|
||||
@@ -1128,6 +1161,8 @@ static int loop_clr_fd(struct loop_device *lo)
|
||||
@@ -1126,6 +1159,8 @@ static int loop_clr_fd(struct loop_device *lo)
|
||||
* bd_mutex which is usually taken before lo_ctl_mutex.
|
||||
*/
|
||||
fput(filp);
|
||||
|
@ -153,10 +152,10 @@ index 4d42c7a..a4974ee 100644
|
|||
void *key_data;
|
||||
|
||||
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
|
||||
index 937a20d..1355656 100644
|
||||
index 5309874..1a334cf 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)
|
||||
@@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
|
||||
if (IS_ERR(h_file))
|
||||
goto out;
|
||||
|
||||
|
@ -215,10 +214,10 @@ index 05d703d..6bb23c8 100644
|
|||
|
||||
#endif /* __KERNEL__ */
|
||||
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
|
||||
index 4020639..13e315f 100644
|
||||
index 777503e..7130061 100644
|
||||
--- a/fs/aufs/super.c
|
||||
+++ b/fs/aufs/super.c
|
||||
@@ -840,7 +840,10 @@ static const struct super_operations aufs_sop = {
|
||||
@@ -845,7 +845,10 @@ static const struct super_operations aufs_sop = {
|
||||
.statfs = aufs_statfs,
|
||||
.put_super = aufs_put_super,
|
||||
.sync_fs = aufs_sync_fs,
|
||||
|
@ -231,10 +230,10 @@ index 4020639..13e315f 100644
|
|||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
diff --git a/include/linux/fs.h b/include/linux/fs.h
|
||||
index 0d0d247f..50d77f8 100644
|
||||
index 7fb92a9..cff3ca3 100644
|
||||
--- a/include/linux/fs.h
|
||||
+++ b/include/linux/fs.h
|
||||
@@ -1861,6 +1861,10 @@ struct super_operations {
|
||||
@@ -1882,6 +1882,10 @@ struct super_operations {
|
||||
struct shrink_control *);
|
||||
long (*free_cached_objects)(struct super_block *,
|
||||
struct shrink_control *);
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.18 mmap patch
|
||||
aufs4.19 mmap patch
|
||||
|
||||
diff --git a/fs/proc/base.c b/fs/proc/base.c
|
||||
index aaffc0c..ab72941 100644
|
||||
index 7e9f07bf..3ab5901 100644
|
||||
--- a/fs/proc/base.c
|
||||
+++ b/fs/proc/base.c
|
||||
@@ -2004,7 +2004,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
|
||||
@@ -2016,7 +2016,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 3b63be6..fb9913b 100644
|
|||
ino = inode->i_ino;
|
||||
}
|
||||
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
|
||||
index dfd73a4..ed2ce10 100644
|
||||
index 5ea1d64..7865a470 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)
|
||||
const char *name = NULL;
|
||||
|
||||
if (file) {
|
||||
|
@ -46,7 +46,7 @@ index dfd73a4..ed2ce10 100644
|
|||
dev = inode->i_sb->s_dev;
|
||||
ino = inode->i_ino;
|
||||
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
|
||||
@@ -1734,7 +1737,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
|
||||
@@ -1727,7 +1730,7 @@ static int show_numa_map(struct seq_file *m, void *v)
|
||||
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
|
||||
struct vm_area_struct *vma = v;
|
||||
struct numa_maps *md = &numa_priv->md;
|
||||
|
@ -56,10 +56,10 @@ index dfd73a4..ed2ce10 100644
|
|||
struct mm_walk walk = {
|
||||
.hugetlb_entry = gather_hugetlb_stats,
|
||||
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
|
||||
index 5b62f57..dfb4a3b 100644
|
||||
index 0b63d68..400d1c5 100644
|
||||
--- a/fs/proc/task_nommu.c
|
||||
+++ b/fs/proc/task_nommu.c
|
||||
@@ -156,7 +156,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
|
||||
@@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
|
||||
file = vma->vm_file;
|
||||
|
||||
if (file) {
|
||||
|
@ -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 68a5121..d7dd986 100644
|
||||
index 0416a72..4a298a9 100644
|
||||
--- a/include/linux/mm.h
|
||||
+++ b/include/linux/mm.h
|
||||
@@ -1448,6 +1448,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
|
||||
@@ -1440,6 +1440,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
|
||||
unmap_mapping_range(mapping, holebegin, holelen, 0);
|
||||
}
|
||||
|
||||
|
@ -105,10 +105,10 @@ index 68a5121..d7dd986 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 99ce070..8babe35 100644
|
||||
index 5ed8f62..0122975 100644
|
||||
--- a/include/linux/mm_types.h
|
||||
+++ b/include/linux/mm_types.h
|
||||
@@ -236,6 +236,7 @@ struct vm_region {
|
||||
@@ -239,6 +239,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 99ce070..8babe35 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
|
||||
@@ -310,6 +311,7 @@ struct vm_area_struct {
|
||||
@@ -313,6 +314,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 99ce070..8babe35 100644
|
|||
|
||||
atomic_long_t swap_readahead_info;
|
||||
diff --git a/kernel/fork.c b/kernel/fork.c
|
||||
index 1b27bab..382f45d 100644
|
||||
index f0b5847..fa562c3 100644
|
||||
--- a/kernel/fork.c
|
||||
+++ b/kernel/fork.c
|
||||
@@ -504,7 +504,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
|
||||
@@ -505,7 +505,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,10 +138,10 @@ index 1b27bab..382f45d 100644
|
|||
atomic_dec(&inode->i_writecount);
|
||||
i_mmap_lock_write(mapping);
|
||||
diff --git a/mm/Makefile b/mm/Makefile
|
||||
index 8716bda..68afd6d 100644
|
||||
index 26ef77a..b2869af 100644
|
||||
--- a/mm/Makefile
|
||||
+++ b/mm/Makefile
|
||||
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o \
|
||||
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
|
||||
mm_init.o mmu_context.o percpu.o slab_common.o \
|
||||
compaction.o vmacache.o \
|
||||
interval_tree.o list_lru.o workingset.o \
|
||||
|
@ -164,7 +164,7 @@ index 52517f2..250f675 100644
|
|||
if (page->mapping != inode->i_mapping) {
|
||||
unlock_page(page);
|
||||
diff --git a/mm/mmap.c b/mm/mmap.c
|
||||
index 17bbf4d..a31c3e1 100644
|
||||
index f7cd9cb..515e88a 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)
|
||||
|
@ -185,7 +185,7 @@ index 17bbf4d..a31c3e1 100644
|
|||
}
|
||||
if (next->anon_vma)
|
||||
anon_vma_merge(vma, next);
|
||||
@@ -1820,8 +1820,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
|
||||
@@ -1821,8 +1821,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
|
||||
return addr;
|
||||
|
||||
unmap_and_free_vma:
|
||||
|
@ -195,7 +195,7 @@ index 17bbf4d..a31c3e1 100644
|
|||
|
||||
/* Undo any partial mapping done by a device driver. */
|
||||
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
|
||||
@@ -2640,7 +2640,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
|
||||
@@ -2641,7 +2641,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 17bbf4d..a31c3e1 100644
|
|||
|
||||
if (new->vm_ops && new->vm_ops->open)
|
||||
new->vm_ops->open(new);
|
||||
@@ -2659,7 +2659,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
|
||||
@@ -2660,7 +2660,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 17bbf4d..a31c3e1 100644
|
|||
unlink_anon_vmas(new);
|
||||
out_free_mpol:
|
||||
mpol_put(vma_policy(new));
|
||||
@@ -2821,7 +2821,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
||||
@@ -2822,7 +2822,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 17bbf4d..a31c3e1 100644
|
|||
|
||||
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
|
||||
current->comm, current->pid);
|
||||
@@ -2896,10 +2896,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
||||
@@ -2897,10 +2897,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -251,7 +251,7 @@ index 17bbf4d..a31c3e1 100644
|
|||
out:
|
||||
up_write(&mm->mmap_sem);
|
||||
if (populate)
|
||||
@@ -3207,7 +3224,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
|
||||
@@ -3206,7 +3223,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 17bbf4d..a31c3e1 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 9fc9e43..25d4c49 100644
|
||||
index e4aac33..b27b200 100644
|
||||
--- a/mm/nommu.c
|
||||
+++ b/mm/nommu.c
|
||||
@@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm_region *region)
|
||||
@@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region)
|
||||
up_write(&nommu_region_sem);
|
||||
|
||||
if (region->vm_file)
|
||||
|
@ -273,7 +273,7 @@ index 9fc9e43..25d4c49 100644
|
|||
|
||||
/* IO memory and memory shared directly out of the pagecache
|
||||
* from ramfs/tmpfs mustn't be released here */
|
||||
@@ -767,7 +767,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
|
||||
@@ -763,7 +763,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 9fc9e43..25d4c49 100644
|
|||
put_nommu_region(vma->vm_region);
|
||||
vm_area_free(vma);
|
||||
}
|
||||
@@ -1290,7 +1290,7 @@ unsigned long do_mmap(struct file *file,
|
||||
@@ -1286,7 +1286,7 @@ unsigned long do_mmap(struct file *file,
|
||||
goto error_just_free;
|
||||
}
|
||||
}
|
||||
|
@ -291,7 +291,7 @@ index 9fc9e43..25d4c49 100644
|
|||
kmem_cache_free(vm_region_jar, region);
|
||||
region = pregion;
|
||||
result = start;
|
||||
@@ -1365,7 +1365,7 @@ unsigned long do_mmap(struct file *file,
|
||||
@@ -1361,7 +1361,7 @@ unsigned long do_mmap(struct file *file,
|
||||
up_write(&nommu_region_sem);
|
||||
error:
|
||||
if (region->vm_file)
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.18 standalone patch
|
||||
aufs4.19 standalone patch
|
||||
|
||||
diff --git a/fs/dcache.c b/fs/dcache.c
|
||||
index 88a1514..e3f500a 100644
|
||||
index 9f57bd8..328a136 100644
|
||||
--- a/fs/dcache.c
|
||||
+++ b/fs/dcache.c
|
||||
@@ -1342,6 +1342,7 @@ void d_walk(struct dentry *parent, void *data,
|
||||
@@ -1343,6 +1343,7 @@ void d_walk(struct dentry *parent, void *data,
|
||||
seq = 1;
|
||||
goto again;
|
||||
}
|
||||
|
@ -13,7 +13,7 @@ index 88a1514..e3f500a 100644
|
|||
|
||||
struct check_mount {
|
||||
struct vfsmount *mnt;
|
||||
@@ -2890,6 +2891,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
|
||||
@@ -2837,6 +2838,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
|
||||
|
||||
write_sequnlock(&rename_lock);
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ index 88a1514..e3f500a 100644
|
|||
/**
|
||||
* d_ancestor - search for an ancestor
|
||||
diff --git a/fs/exec.c b/fs/exec.c
|
||||
index bdd0eac..edd3405 100644
|
||||
index 1ebf6e5..a72c294 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 bdd0eac..edd3405 100644
|
|||
#ifdef CONFIG_USELIB
|
||||
/*
|
||||
diff --git a/fs/fcntl.c b/fs/fcntl.c
|
||||
index 545e686..0237ad7 100644
|
||||
index c91b3e3..7751309 100644
|
||||
--- a/fs/fcntl.c
|
||||
+++ b/fs/fcntl.c
|
||||
@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
|
||||
|
@ -46,18 +46,18 @@ index 545e686..0237ad7 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 7ec0b3e..819ee07 100644
|
||||
index e49af4c..569020f 100644
|
||||
--- a/fs/file_table.c
|
||||
+++ b/fs/file_table.c
|
||||
@@ -147,6 +147,7 @@ struct file *get_empty_filp(void)
|
||||
@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
|
||||
}
|
||||
return ERR_PTR(-ENFILE);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(get_empty_filp);
|
||||
+EXPORT_SYMBOL_GPL(alloc_empty_file);
|
||||
|
||||
/**
|
||||
* alloc_file - allocate and initialize a 'struct file'
|
||||
@@ -257,6 +258,7 @@ void flush_delayed_fput(void)
|
||||
/*
|
||||
* Variant of alloc_empty_file() that doesn't check and modify nr_files.
|
||||
@@ -323,6 +324,7 @@ void flush_delayed_fput(void)
|
||||
{
|
||||
delayed_fput(NULL);
|
||||
}
|
||||
|
@ -65,27 +65,19 @@ index 7ec0b3e..819ee07 100644
|
|||
|
||||
static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
|
||||
|
||||
@@ -299,6 +301,7 @@ void __fput_sync(struct file *file)
|
||||
@@ -365,6 +367,7 @@ void __fput_sync(struct file *file)
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(fput);
|
||||
+EXPORT_SYMBOL_GPL(__fput_sync);
|
||||
|
||||
void put_filp(struct file *file)
|
||||
{
|
||||
@@ -307,6 +310,7 @@ void put_filp(struct file *file)
|
||||
file_free(file);
|
||||
}
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(put_filp);
|
||||
|
||||
void __init files_init(void)
|
||||
{
|
||||
diff --git a/fs/inode.c b/fs/inode.c
|
||||
index af894e7..169811b 100644
|
||||
index fa6ae6a..69d4a6c 100644
|
||||
--- a/fs/inode.c
|
||||
+++ b/fs/inode.c
|
||||
@@ -1658,6 +1658,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
|
||||
@@ -1666,6 +1666,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
|
||||
|
||||
return update_time(inode, time, flags);
|
||||
}
|
||||
|
@ -94,10 +86,10 @@ index af894e7..169811b 100644
|
|||
/**
|
||||
* touch_atime - update the access time
|
||||
diff --git a/fs/namespace.c b/fs/namespace.c
|
||||
index eb7cd21..c536458 100644
|
||||
index 72c93f3..c49803c 100644
|
||||
--- a/fs/namespace.c
|
||||
+++ b/fs/namespace.c
|
||||
@@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
|
||||
@@ -437,6 +437,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
|
||||
mnt_dec_writers(real_mount(mnt));
|
||||
preempt_enable();
|
||||
}
|
||||
|
@ -105,7 +97,7 @@ index eb7cd21..c536458 100644
|
|||
|
||||
/**
|
||||
* mnt_drop_write - give up write access to a mount
|
||||
@@ -860,6 +861,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
|
||||
@@ -775,6 +776,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
|
||||
{
|
||||
return check_mnt(real_mount(mnt));
|
||||
}
|
||||
|
@ -113,7 +105,7 @@ index eb7cd21..c536458 100644
|
|||
|
||||
/*
|
||||
* vfsmount lock must be held for write
|
||||
@@ -1917,6 +1919,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
|
||||
@@ -1832,6 +1834,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -122,18 +114,18 @@ index eb7cd21..c536458 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 aa5468f2..b38d224 100644
|
||||
index c03b836..817f22c 100644
|
||||
--- a/fs/notify/group.c
|
||||
+++ b/fs/notify/group.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/srcu.h>
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <linux/rculist.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/memcontrol.h>
|
||||
+#include <linux/module.h>
|
||||
|
||||
#include <linux/fsnotify_backend.h>
|
||||
#include "fsnotify.h"
|
||||
@@ -109,6 +110,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
|
||||
@@ -112,6 +113,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
|
||||
{
|
||||
refcount_inc(&group->refcnt);
|
||||
}
|
||||
|
@ -141,7 +133,7 @@ index aa5468f2..b38d224 100644
|
|||
|
||||
/*
|
||||
* Drop a reference to a group. Free it if it's through.
|
||||
@@ -118,6 +120,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
|
||||
@@ -121,6 +123,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
|
||||
if (refcount_dec_and_test(&group->refcnt))
|
||||
fsnotify_final_destroy_group(group);
|
||||
}
|
||||
|
@ -149,7 +141,7 @@ index aa5468f2..b38d224 100644
|
|||
|
||||
/*
|
||||
* Create a new fsnotify_group and hold a reference for the group returned.
|
||||
@@ -147,6 +150,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
|
||||
@@ -150,6 +153,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
|
||||
|
||||
return group;
|
||||
}
|
||||
|
@ -158,10 +150,10 @@ index aa5468f2..b38d224 100644
|
|||
int fsnotify_fasync(int fd, struct file *file, int on)
|
||||
{
|
||||
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
|
||||
index 61f4c5f..855c655 100644
|
||||
index 59cdb27..ce365c7 100644
|
||||
--- a/fs/notify/mark.c
|
||||
+++ b/fs/notify/mark.c
|
||||
@@ -245,6 +245,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
|
||||
@@ -263,6 +263,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
|
||||
queue_delayed_work(system_unbound_wq, &reaper_work,
|
||||
FSNOTIFY_REAPER_DELAY);
|
||||
}
|
||||
|
@ -169,7 +161,7 @@ index 61f4c5f..855c655 100644
|
|||
|
||||
/*
|
||||
* 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,
|
||||
@@ -417,6 +418,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
|
||||
mutex_unlock(&group->mark_mutex);
|
||||
fsnotify_free_mark(mark);
|
||||
}
|
||||
|
@ -177,7 +169,7 @@ index 61f4c5f..855c655 100644
|
|||
|
||||
/*
|
||||
* Sorting function for lists of fsnotify marks.
|
||||
@@ -624,6 +626,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
|
||||
@@ -632,6 +634,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,
|
||||
mutex_unlock(&group->mark_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
@ -185,7 +177,7 @@ index 61f4c5f..855c655 100644
|
|||
|
||||
/*
|
||||
* 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,
|
||||
@@ -754,6 +757,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
|
||||
fsnotify_get_group(group);
|
||||
mark->group = group;
|
||||
}
|
||||
|
@ -194,7 +186,7 @@ index 61f4c5f..855c655 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 d0e955b..527bc1a 100644
|
||||
index 0285ce7..cb81623 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,16 +197,8 @@ index d0e955b..527bc1a 100644
|
|||
|
||||
long vfs_truncate(const struct path *path, loff_t length)
|
||||
{
|
||||
@@ -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);
|
||||
|
||||
int open_check_o_direct(struct file *f)
|
||||
{
|
||||
diff --git a/fs/read_write.c b/fs/read_write.c
|
||||
index ccc5bc8..36f52f4 100644
|
||||
index 42f64cc..d9cb969 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)
|
||||
|
@ -282,10 +266,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 f9cb1db..000b62b 100644
|
||||
index 0d6a6a4..7ce4701 100644
|
||||
--- a/fs/xattr.c
|
||||
+++ b/fs/xattr.c
|
||||
@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
|
||||
@@ -295,6 +295,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
|
||||
*xattr_value = value;
|
||||
return error;
|
||||
}
|
||||
|
@ -294,7 +278,7 @@ index f9cb1db..000b62b 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 720f070..4f58215 100644
|
||||
index fa6f559..7ac19ef 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,7 +299,7 @@ index 0fef395..83fb1ec 100644
|
|||
}
|
||||
+EXPORT_SYMBOL_GPL(task_work_run);
|
||||
diff --git a/security/commoncap.c b/security/commoncap.c
|
||||
index f4c33ab..70563f1 100644
|
||||
index 2e489d6..1e146da 100644
|
||||
--- a/security/commoncap.c
|
||||
+++ b/security/commoncap.c
|
||||
@@ -1336,12 +1336,14 @@ int cap_mmap_addr(unsigned long addr)
|
||||
|
@ -351,10 +335,10 @@ index cd97929..424fd23 100644
|
|||
}
|
||||
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
|
||||
diff --git a/security/security.c b/security/security.c
|
||||
index 68f46d8..3bc1348 100644
|
||||
index 736e78d..b314539 100644
|
||||
--- a/security/security.c
|
||||
+++ b/security/security.c
|
||||
@@ -537,6 +537,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
|
||||
@@ -542,6 +542,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 +346,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
int security_path_unlink(const struct path *dir, struct dentry *dentry)
|
||||
{
|
||||
@@ -553,6 +554,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
|
||||
@@ -558,6 +559,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 +354,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
|
||||
struct dentry *new_dentry)
|
||||
@@ -561,6 +563,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
|
||||
@@ -566,6 +568,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 +362,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
|
||||
const struct path *new_dir, struct dentry *new_dentry,
|
||||
@@ -588,6 +591,7 @@ int security_path_truncate(const struct path *path)
|
||||
@@ -593,6 +596,7 @@ int security_path_truncate(const struct path *path)
|
||||
return 0;
|
||||
return call_int_hook(path_truncate, 0, path);
|
||||
}
|
||||
|
@ -386,7 +370,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
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)
|
||||
@@ -600,6 +604,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 +378,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
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)
|
||||
@@ -607,6 +612,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 +386,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
int security_path_chroot(const struct path *path)
|
||||
{
|
||||
@@ -687,6 +693,7 @@ int security_inode_readlink(struct dentry *dentry)
|
||||
@@ -692,6 +698,7 @@ int security_inode_readlink(struct dentry *dentry)
|
||||
return 0;
|
||||
return call_int_hook(inode_readlink, 0, dentry);
|
||||
}
|
||||
|
@ -410,7 +394,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
|
||||
bool rcu)
|
||||
@@ -702,6 +709,7 @@ int security_inode_permission(struct inode *inode, int mask)
|
||||
@@ -707,6 +714,7 @@ int security_inode_permission(struct inode *inode, int mask)
|
||||
return 0;
|
||||
return call_int_hook(inode_permission, 0, inode, mask);
|
||||
}
|
||||
|
@ -418,7 +402,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
{
|
||||
@@ -873,6 +881,7 @@ int security_file_permission(struct file *file, int mask)
|
||||
@@ -878,6 +886,7 @@ int security_file_permission(struct file *file, int mask)
|
||||
|
||||
return fsnotify_perm(file, mask);
|
||||
}
|
||||
|
@ -426,7 +410,7 @@ index 68f46d8..3bc1348 100644
|
|||
|
||||
int security_file_alloc(struct file *file)
|
||||
{
|
||||
@@ -932,6 +941,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
|
||||
@@ -937,6 +946,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
|
@ -18,4 +18,4 @@ CONFIG_AUFS_BR_FUSE=y
|
|||
CONFIG_AUFS_POLL=y
|
||||
CONFIG_AUFS_BR_HFSPLUS=y
|
||||
CONFIG_AUFS_BDEV_LOOP=y
|
||||
# CONFIG_AUFS_DEBUG is not set
|
||||
CONFIG_AUFS_DEBUG = y
|
||||
|
|
|
@ -5,7 +5,7 @@ rm -Rf aufs4-standalone
|
|||
git clone git://github.com/sfjro/aufs4-standalone.git aufs4-standalone
|
||||
cd aufs4-standalone
|
||||
git branch -r
|
||||
git checkout origin/aufs4.13
|
||||
git checkout origin/aufs4.19
|
||||
|
||||
# modify what you want
|
||||
|
||||
|
@ -15,16 +15,16 @@ git checkout origin/aufs4.13
|
|||
rm -v $(find . -type f -name '*.orig')
|
||||
grep -qse 'EXPORT_SYMBOL(' aufs4-standalone.patch && \
|
||||
sed -i-old -e 's|EXPORT_SYMBOL(|EXPORT_SYMBOL_GPL(|' aufs4-standalone.patch
|
||||
rm -rf ../tmp/linux-4.13
|
||||
mkdir -p ../tmp/linux-4.13
|
||||
cp -a fs ../tmp/linux-4.13
|
||||
cp -a include ../tmp/linux-4.13
|
||||
cp -a Documentation ../tmp/linux-4.13
|
||||
rm ../tmp/linux-4.13/include/uapi/linux/Kbuild
|
||||
rm -rf ../tmp/linux-4.19
|
||||
mkdir -p ../tmp/linux-4.19
|
||||
cp -a fs ../tmp/linux-4.19
|
||||
cp -a include ../tmp/linux-4.19
|
||||
cp -a Documentation ../tmp/linux-4.19
|
||||
rm ../tmp/linux-4.19/include/uapi/linux/Kbuild
|
||||
cd ../tmp
|
||||
diff -Naur null linux-4.13 | filterdiff | \
|
||||
sed -e 's|null\(/include/uapi/linux/Kbuild\)|linux-4.13-old\1|;s|^--- null.*|--- /dev/null|;\|linux-4.13/include/uapi/linux/Kbuild|,${\|@@ -0,0 +1 @@|,$d}' \
|
||||
| bzip2 > aufs$(sed -ne 's|#define.*AUFS_VERSION.*"\(.*\)"|\1|p' linux-4.13/include/uapi/linux/aufs_type.h).patch.bz2
|
||||
diff -Naur null linux-4.19 | filterdiff | \
|
||||
sed -e 's|null\(/include/uapi/linux/Kbuild\)|linux-4.19-old\1|;s|^--- null.*|--- /dev/null|;\|linux-4.19/include/uapi/linux/Kbuild|,${\|@@ -0,0 +1 @@|,$d}' \
|
||||
| bzip2 > aufs$(sed -ne 's|#define.*AUFS_VERSION.*"\(.*\)"|\1|p' linux-4.19/include/uapi/linux/aufs_type.h).patch.bz2
|
||||
mv *.bz2 $OLDPWD
|
||||
cd $OLDPWD
|
||||
mv *patch* ..
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
surum=4.18.12
|
||||
surum=4.19.2
|
||||
sonek=milis
|
||||
depmod ${surum}-$sonek
|
||||
cd /boot
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
|
||||
index f4122c8fdd97..ef9b502ce576 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
|
||||
@@ -2289,6 +2289,7 @@ void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, struct sk_buff *skb)
|
||||
|
||||
if (rtl_c2h_fast_cmd(hw, skb)) {
|
||||
rtl_c2h_content_parsing(hw, skb);
|
||||
+ kfree_skb(skb);
|
||||
return;
|
||||
}
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
# Grup: sistem
|
||||
|
||||
isim=kernel
|
||||
_basekernel=4.18
|
||||
surum=4.18.12
|
||||
_basekernel=4.19
|
||||
surum=4.19.2
|
||||
devir=1
|
||||
|
||||
kaynak=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-$_basekernel.tar.xz
|
||||
|
@ -20,7 +20,8 @@ kaynak=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-$_basekernel.tar.xz
|
|||
aufs4.patch
|
||||
config.aufs
|
||||
tmpfs-idr.patch
|
||||
vfs-ino.patch)
|
||||
vfs-ino.patch
|
||||
rtlwifi.patch)
|
||||
|
||||
|
||||
derle() {
|
||||
|
@ -43,6 +44,7 @@ derle() {
|
|||
patch -p1 -i "${SRC}/aufs4-standalone.patch"
|
||||
patch -p1 -i "${SRC}/tmpfs-idr.patch"
|
||||
patch -p1 -i "${SRC}/vfs-ino.patch"
|
||||
patch -p1 -i "${SRC}/rtlwifi.patch"
|
||||
|
||||
cat "${SRC}/config" > ./.config
|
||||
|
||||
|
|
|
@ -20,10 +20,10 @@ index f155dc6..ed9ec5b 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 41b9bbf..3b4b410 100644
|
||||
index 4469426..c553b64 100644
|
||||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -111,9 +111,13 @@ static unsigned long shmem_default_max_blocks(void)
|
||||
@@ -112,9 +112,13 @@ static unsigned long shmem_default_max_blocks(void)
|
||||
return totalram_pages / 2;
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ index 41b9bbf..3b4b410 100644
|
|||
}
|
||||
#endif
|
||||
|
||||
@@ -1105,6 +1109,11 @@ static void shmem_evict_inode(struct inode *inode)
|
||||
@@ -1106,6 +1110,11 @@ static void shmem_evict_inode(struct inode *inode)
|
||||
|
||||
simple_xattrs_free(&info->xattrs);
|
||||
WARN_ON(inode->i_blocks);
|
||||
|
@ -51,7 +51,7 @@ index 41b9bbf..3b4b410 100644
|
|||
shmem_free_inode(inode->i_sb);
|
||||
clear_inode(inode);
|
||||
}
|
||||
@@ -2178,13 +2187,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
|
||||
@@ -2179,13 +2188,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,11 +66,10 @@ index 41b9bbf..3b4b410 100644
|
|||
inode_init_owner(inode, dir, mode);
|
||||
inode->i_blocks = 0;
|
||||
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
|
||||
@@ -2226,6 +2235,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
|
||||
@@ -2228,6 +2237,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
|
||||
break;
|
||||
}
|
||||
|
||||
lockdep_annotate_inode_mutex_key(inode);
|
||||
+
|
||||
|
||||
+ if (!sbinfo->idr_nouse) {
|
||||
+ /* inum 0 and 1 are unused */
|
||||
+ mutex_lock(&sbinfo->idr_lock);
|
||||
|
@ -89,10 +88,11 @@ index 41b9bbf..3b4b410 100644
|
|||
+ }
|
||||
+ } else
|
||||
+ inode->i_ino = get_next_ino();
|
||||
+
|
||||
lockdep_annotate_inode_mutex_key(inode);
|
||||
} else
|
||||
shmem_free_inode(sb);
|
||||
return inode;
|
||||
@@ -3205,8 +3233,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
|
||||
@@ -3208,8 +3236,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 41b9bbf..3b4b410 100644
|
|||
return ino->i_ino == inum && fh[0] == ino->i_generation;
|
||||
}
|
||||
|
||||
@@ -3226,14 +3253,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
|
||||
@@ -3229,14 +3256,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
|
||||
struct dentry *dentry = NULL;
|
||||
u64 inum;
|
||||
|
||||
|
@ -120,7 +120,7 @@ index 41b9bbf..3b4b410 100644
|
|||
if (inode) {
|
||||
dentry = shmem_find_alias(inode);
|
||||
iput(inode);
|
||||
@@ -3245,30 +3269,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
|
||||
@@ -3248,30 +3272,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 41b9bbf..3b4b410 100644
|
|||
return 1;
|
||||
}
|
||||
|
||||
@@ -3332,7 +3341,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
|
||||
@@ -3335,7 +3344,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 41b9bbf..3b4b410 100644
|
|||
goto bad_val;
|
||||
} else if (!strcmp(this_char,"mode")) {
|
||||
if (remount)
|
||||
@@ -3397,7 +3406,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
|
||||
@@ -3400,7 +3409,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,16 @@ index 41b9bbf..3b4b410 100644
|
|||
int error = -EINVAL;
|
||||
|
||||
config.mpol = NULL;
|
||||
@@ -3470,6 +3479,8 @@ static void shmem_put_super(struct super_block *sb)
|
||||
@@ -3449,7 +3458,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 != (0777 | S_ISVTX))
|
||||
seq_printf(seq, ",mode=%03ho", sbinfo->mode);
|
||||
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
|
||||
@@ -3473,6 +3482,8 @@ static void shmem_put_super(struct super_block *sb)
|
||||
{
|
||||
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
|
||||
|
||||
|
@ -181,7 +190,7 @@ index 41b9bbf..3b4b410 100644
|
|||
percpu_counter_destroy(&sbinfo->used_blocks);
|
||||
mpol_put(sbinfo->mpol);
|
||||
kfree(sbinfo);
|
||||
@@ -3488,6 +3499,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
|
||||
@@ -3491,6 +3502,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
|
||||
if (!sbinfo)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -190,7 +199,7 @@ index 41b9bbf..3b4b410 100644
|
|||
sbinfo->mode = 0777 | S_ISVTX;
|
||||
sbinfo->uid = current_fsuid();
|
||||
sbinfo->gid = current_fsgid();
|
||||
@@ -3595,6 +3608,15 @@ static void shmem_destroy_inodecache(void)
|
||||
@@ -3598,6 +3611,15 @@ static void shmem_destroy_inodecache(void)
|
||||
kmem_cache_destroy(shmem_inode_cachep);
|
||||
}
|
||||
|
||||
|
@ -206,7 +215,7 @@ index 41b9bbf..3b4b410 100644
|
|||
static const struct address_space_operations shmem_aops = {
|
||||
.writepage = shmem_writepage,
|
||||
.set_page_dirty = __set_page_dirty_no_writeback,
|
||||
@@ -3725,6 +3747,7 @@ int __init shmem_init(void)
|
||||
@@ -3728,6 +3750,7 @@ int __init shmem_init(void)
|
||||
pr_err("Could not kern_mount tmpfs\n");
|
||||
goto out1;
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
diff --git a/fs/inode.c b/fs/inode.c
|
||||
index 8c86c80..63175ca 100644
|
||||
index 42f6d25..2b88a37 100644
|
||||
--- a/fs/inode.c
|
||||
+++ b/fs/inode.c
|
||||
@@ -861,6 +861,8 @@ unsigned int get_next_ino(void)
|
||||
@@ -869,6 +869,8 @@ unsigned int get_next_ino(void)
|
||||
unsigned int *p = &get_cpu_var(last_ino);
|
||||
unsigned int res = *p;
|
||||
|
||||
|
@ -12,7 +12,7 @@ index 8c86c80..63175ca 100644
|
|||
#ifdef CONFIG_SMP
|
||||
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
|
||||
static atomic_t shared_last_ino;
|
||||
@@ -873,7 +875,7 @@ unsigned int get_next_ino(void)
|
||||
@@ -881,7 +883,7 @@ unsigned int get_next_ino(void)
|
||||
res++;
|
||||
/* get_next_ino should not provide a 0 inode number */
|
||||
if (unlikely(!res))
|
||||
|
|
Loading…
Reference in New Issue