kernel-4.18.12-guncellendi
This commit is contained in:
parent
4dafdd8fd0
commit
fd8a7ad610
|
@ -1,11 +1,11 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.17 base patch
|
||||
aufs4.18 base patch
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 9c125f7..4616bbf 100644
|
||||
index 544cac8..aaa1c7a 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -2519,6 +2519,19 @@ F: include/linux/audit.h
|
||||
@@ -2541,6 +2541,19 @@ F: include/linux/audit.h
|
||||
F: include/uapi/linux/audit.h
|
||||
F: kernel/audit*
|
||||
|
||||
|
@ -24,13 +24,13 @@ index 9c125f7..4616bbf 100644
|
|||
+
|
||||
AUXILIARY DISPLAY DRIVERS
|
||||
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
|
||||
W: http://miguelojeda.es/auxdisplay.htm
|
||||
S: Maintained
|
||||
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
|
||||
index 55cf554..bc965e5 100644
|
||||
index 4cb1d1b..5678bf8 100644
|
||||
--- a/drivers/block/loop.c
|
||||
+++ b/drivers/block/loop.c
|
||||
@@ -713,6 +713,24 @@ static inline int is_loop_device(struct file *file)
|
||||
return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
|
||||
@@ -741,6 +741,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
|
||||
return error;
|
||||
}
|
||||
|
||||
+/*
|
||||
|
@ -55,20 +55,20 @@ index 55cf554..bc965e5 100644
|
|||
|
||||
static ssize_t loop_attr_show(struct device *dev, char *page,
|
||||
diff --git a/fs/dcache.c b/fs/dcache.c
|
||||
index 2acfc69..ff338e2 100644
|
||||
index ceb7b49..88a1514 100644
|
||||
--- a/fs/dcache.c
|
||||
+++ b/fs/dcache.c
|
||||
@@ -1234,7 +1234,7 @@ enum d_walk_ret {
|
||||
@@ -1237,7 +1237,7 @@ enum d_walk_ret {
|
||||
*
|
||||
* The @enter() and @finish() callbacks are called with d_lock held.
|
||||
* The @enter() callbacks are called with d_lock held.
|
||||
*/
|
||||
-static void d_walk(struct dentry *parent, void *data,
|
||||
+void d_walk(struct dentry *parent, void *data,
|
||||
enum d_walk_ret (*enter)(void *, struct dentry *),
|
||||
void (*finish)(void *))
|
||||
enum d_walk_ret (*enter)(void *, struct dentry *))
|
||||
{
|
||||
struct dentry *this_parent;
|
||||
diff --git a/fs/fcntl.c b/fs/fcntl.c
|
||||
index d737ff0..7550799 100644
|
||||
index 12273b6..545e686 100644
|
||||
--- a/fs/fcntl.c
|
||||
+++ b/fs/fcntl.c
|
||||
@@ -32,7 +32,7 @@
|
||||
|
@ -90,23 +90,23 @@ index d737ff0..7550799 100644
|
|||
return error;
|
||||
|
||||
diff --git a/fs/inode.c b/fs/inode.c
|
||||
index 3b55391..e0c5255 100644
|
||||
index 8c86c80..af894e7 100644
|
||||
--- a/fs/inode.c
|
||||
+++ b/fs/inode.c
|
||||
@@ -1663,7 +1663,7 @@ EXPORT_SYMBOL(generic_update_time);
|
||||
@@ -1649,7 +1649,7 @@ EXPORT_SYMBOL(generic_update_time);
|
||||
* This does the actual work of updating an inodes time or version. Must have
|
||||
* had called mnt_want_write() before calling this.
|
||||
*/
|
||||
-static int update_time(struct inode *inode, struct timespec *time, int flags)
|
||||
+int update_time(struct inode *inode, struct timespec *time, int flags)
|
||||
-static int update_time(struct inode *inode, struct timespec64 *time, int flags)
|
||||
+int update_time(struct inode *inode, struct timespec64 *time, int flags)
|
||||
{
|
||||
int (*update_time)(struct inode *, struct timespec *, int);
|
||||
int (*update_time)(struct inode *, struct timespec64 *, int);
|
||||
|
||||
diff --git a/fs/namespace.c b/fs/namespace.c
|
||||
index 5f75969..61129ff 100644
|
||||
index bd2f4c6..eb7cd21 100644
|
||||
--- a/fs/namespace.c
|
||||
+++ b/fs/namespace.c
|
||||
@@ -846,6 +846,12 @@ static inline int check_mnt(struct mount *mnt)
|
||||
@@ -855,6 +855,12 @@ static inline int check_mnt(struct mount *mnt)
|
||||
return mnt->mnt_ns == current->nsproxy->mnt_ns;
|
||||
}
|
||||
|
||||
|
@ -120,7 +120,7 @@ index 5f75969..61129ff 100644
|
|||
* vfsmount lock must be held for write
|
||||
*/
|
||||
diff --git a/fs/read_write.c b/fs/read_write.c
|
||||
index c4eabbf..ddd6e67 100644
|
||||
index 153f8f6..ccc5bc8 100644
|
||||
--- a/fs/read_write.c
|
||||
+++ b/fs/read_write.c
|
||||
@@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
|
||||
|
@ -153,10 +153,10 @@ index c4eabbf..ddd6e67 100644
|
|||
{
|
||||
mm_segment_t old_fs;
|
||||
diff --git a/fs/splice.c b/fs/splice.c
|
||||
index 005d09c..f617ab0 100644
|
||||
index b3daa97..1dd7f96 100644
|
||||
--- a/fs/splice.c
|
||||
+++ b/fs/splice.c
|
||||
@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
|
||||
@@ -838,8 +838,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
|
||||
/*
|
||||
* Attempt to initiate a splice from pipe to file.
|
||||
*/
|
||||
|
@ -167,7 +167,7 @@ index 005d09c..f617ab0 100644
|
|||
{
|
||||
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
|
||||
loff_t *, size_t, unsigned int);
|
||||
@@ -854,9 +854,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
@@ -855,9 +855,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
/*
|
||||
* Attempt to initiate a splice from a file to a pipe.
|
||||
*/
|
||||
|
@ -206,10 +206,10 @@ index 279720d..76e38ea 100644
|
|||
static inline void fput_light(struct file *file, int fput_needed)
|
||||
{
|
||||
diff --git a/include/linux/fs.h b/include/linux/fs.h
|
||||
index 760d8da..09a2542 100644
|
||||
index 805bf22..0d0d247f 100644
|
||||
--- a/include/linux/fs.h
|
||||
+++ b/include/linux/fs.h
|
||||
@@ -1270,6 +1270,7 @@ extern void fasync_free(struct fasync_struct *);
|
||||
@@ -1273,6 +1273,7 @@ extern void fasync_free(struct fasync_struct *);
|
||||
/* can be called from interrupts */
|
||||
extern void kill_fasync(struct fasync_struct **, int, int);
|
||||
|
||||
|
@ -217,7 +217,7 @@ index 760d8da..09a2542 100644
|
|||
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
|
||||
extern int f_setown(struct file *filp, unsigned long arg, int force);
|
||||
extern void f_delown(struct file *filp);
|
||||
@@ -1724,6 +1725,7 @@ struct file_operations {
|
||||
@@ -1733,6 +1734,7 @@ struct file_operations {
|
||||
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
|
||||
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
|
||||
int (*check_flags)(int);
|
||||
|
@ -225,7 +225,7 @@ index 760d8da..09a2542 100644
|
|||
int (*flock) (struct file *, int, struct file_lock *);
|
||||
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
|
||||
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
|
||||
@@ -1794,6 +1796,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
|
||||
@@ -1803,6 +1805,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
|
||||
struct iovec *fast_pointer,
|
||||
struct iovec **ret_pointer);
|
||||
|
||||
|
@ -238,15 +238,15 @@ index 760d8da..09a2542 100644
|
|||
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
|
||||
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
|
||||
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
|
||||
@@ -2199,6 +2207,7 @@ extern int current_umask(void);
|
||||
@@ -2218,6 +2226,7 @@ extern int current_umask(void);
|
||||
extern void ihold(struct inode * inode);
|
||||
extern void iput(struct inode *);
|
||||
extern int generic_update_time(struct inode *, struct timespec *, int);
|
||||
+extern int update_time(struct inode *, struct timespec *, int);
|
||||
extern int generic_update_time(struct inode *, struct timespec64 *, int);
|
||||
+extern int update_time(struct inode *, struct timespec64 *, int);
|
||||
|
||||
/* /sys/fs */
|
||||
extern struct kobject *fs_kobj;
|
||||
@@ -2485,6 +2494,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
|
||||
@@ -2505,6 +2514,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
@ -310,7 +310,7 @@ index 74b4911..19789fb 100644
|
|||
+ unsigned int flags);
|
||||
#endif
|
||||
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
|
||||
index 0233863..06e0d7a 100644
|
||||
index 5fa4d31..720f070 100644
|
||||
--- a/kernel/locking/lockdep.c
|
||||
+++ b/kernel/locking/lockdep.c
|
||||
@@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.17 kbuild patch
|
||||
aufs4.18 kbuild patch
|
||||
|
||||
diff --git a/fs/Kconfig b/fs/Kconfig
|
||||
index bc821a8..7ae814c 100644
|
||||
index ac474a6..284cee9 100644
|
||||
--- a/fs/Kconfig
|
||||
+++ b/fs/Kconfig
|
||||
@@ -251,6 +251,7 @@ source "fs/pstore/Kconfig"
|
||||
@@ -255,6 +255,7 @@ source "fs/pstore/Kconfig"
|
||||
source "fs/sysv/Kconfig"
|
||||
source "fs/ufs/Kconfig"
|
||||
source "fs/exofs/Kconfig"
|
||||
|
@ -14,7 +14,7 @@ index bc821a8..7ae814c 100644
|
|||
endif # MISC_FILESYSTEMS
|
||||
|
||||
diff --git a/fs/Makefile b/fs/Makefile
|
||||
index c9375fd..8af5671 100644
|
||||
index 293733f..12d19d0 100644
|
||||
--- a/fs/Makefile
|
||||
+++ b/fs/Makefile
|
||||
@@ -128,3 +128,4 @@ obj-y += exofs/ # Multiple modules
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.17 loopback patch
|
||||
aufs4.18 loopback patch
|
||||
|
||||
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
|
||||
index 5678bf8..ec9c4fb 100644
|
||||
|
@ -153,7 +153,7 @@ index 4d42c7a..a4974ee 100644
|
|||
void *key_data;
|
||||
|
||||
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
|
||||
index 7ca7f67..3d4e90d 100644
|
||||
index 937a20d..1355656 100644
|
||||
--- a/fs/aufs/f_op.c
|
||||
+++ b/fs/aufs/f_op.c
|
||||
@@ -358,7 +358,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
|
||||
|
@ -166,7 +166,7 @@ index 7ca7f67..3d4e90d 100644
|
|||
if (file->f_mapping != h_file->f_mapping) {
|
||||
file->f_mapping = h_file->f_mapping;
|
||||
diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
|
||||
index 2d65b8f..5ed7903 100644
|
||||
index 3d84349..a642de5 100644
|
||||
--- a/fs/aufs/loop.c
|
||||
+++ b/fs/aufs/loop.c
|
||||
@@ -133,3 +133,19 @@ void au_loopback_fin(void)
|
||||
|
@ -215,7 +215,7 @@ index 05d703d..6bb23c8 100644
|
|||
|
||||
#endif /* __KERNEL__ */
|
||||
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
|
||||
index eed37ba..a3a5cd7 100644
|
||||
index 4020639..13e315f 100644
|
||||
--- a/fs/aufs/super.c
|
||||
+++ b/fs/aufs/super.c
|
||||
@@ -840,7 +840,10 @@ static const struct super_operations aufs_sop = {
|
||||
|
@ -231,7 +231,7 @@ index eed37ba..a3a5cd7 100644
|
|||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
diff --git a/include/linux/fs.h b/include/linux/fs.h
|
||||
index 3a9d5b4..50a30c2 100644
|
||||
index 0d0d247f..50d77f8 100644
|
||||
--- a/include/linux/fs.h
|
||||
+++ b/include/linux/fs.h
|
||||
@@ -1861,6 +1861,10 @@ struct super_operations {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.17 mmap patch
|
||||
aufs4.18 mmap patch
|
||||
|
||||
diff --git a/fs/proc/base.c b/fs/proc/base.c
|
||||
index 1a76d75..77f698e 100644
|
||||
index aaffc0c..ab72941 100644
|
||||
--- a/fs/proc/base.c
|
||||
+++ b/fs/proc/base.c
|
||||
@@ -2024,7 +2024,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
|
||||
@@ -2004,7 +2004,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
|
||||
down_read(&mm->mmap_sem);
|
||||
vma = find_exact_vma(mm, vm_start, vm_end);
|
||||
if (vma && vma->vm_file) {
|
||||
|
@ -15,7 +15,7 @@ index 1a76d75..77f698e 100644
|
|||
rc = 0;
|
||||
}
|
||||
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
|
||||
index 7563437..7c0dc0f 100644
|
||||
index 3b63be6..fb9913b 100644
|
||||
--- a/fs/proc/nommu.c
|
||||
+++ b/fs/proc/nommu.c
|
||||
@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
|
||||
|
@ -31,10 +31,10 @@ index 7563437..7c0dc0f 100644
|
|||
ino = inode->i_ino;
|
||||
}
|
||||
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
|
||||
index c486ad4..76b71f8 100644
|
||||
index dfd73a4..ed2ce10 100644
|
||||
--- a/fs/proc/task_mmu.c
|
||||
+++ b/fs/proc/task_mmu.c
|
||||
@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
|
||||
@@ -306,7 +306,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
|
||||
const char *name = NULL;
|
||||
|
||||
if (file) {
|
||||
|
@ -46,7 +46,7 @@ index c486ad4..76b71f8 100644
|
|||
dev = inode->i_sb->s_dev;
|
||||
ino = inode->i_ino;
|
||||
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
|
||||
@@ -1726,7 +1729,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
|
||||
@@ -1734,7 +1737,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
|
||||
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
|
||||
struct vm_area_struct *vma = v;
|
||||
struct numa_maps *md = &numa_priv->md;
|
||||
|
@ -72,10 +72,10 @@ index 5b62f57..dfb4a3b 100644
|
|||
ino = inode->i_ino;
|
||||
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
|
||||
diff --git a/include/linux/mm.h b/include/linux/mm.h
|
||||
index 02a616e..01b3bb9 100644
|
||||
index 68a5121..d7dd986 100644
|
||||
--- a/include/linux/mm.h
|
||||
+++ b/include/linux/mm.h
|
||||
@@ -1380,6 +1380,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
|
||||
@@ -1448,6 +1448,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
|
||||
unmap_mapping_range(mapping, holebegin, holelen, 0);
|
||||
}
|
||||
|
||||
|
@ -105,10 +105,10 @@ index 02a616e..01b3bb9 100644
|
|||
void *buf, int len, unsigned int gup_flags);
|
||||
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
|
||||
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
|
||||
index 2161234..78aa367 100644
|
||||
index 99ce070..8babe35 100644
|
||||
--- a/include/linux/mm_types.h
|
||||
+++ b/include/linux/mm_types.h
|
||||
@@ -251,6 +251,7 @@ struct vm_region {
|
||||
@@ -236,6 +236,7 @@ struct vm_region {
|
||||
unsigned long vm_top; /* region allocated to here */
|
||||
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
|
||||
struct file *vm_file; /* the backing file or NULL */
|
||||
|
@ -116,7 +116,7 @@ index 2161234..78aa367 100644
|
|||
|
||||
int vm_usage; /* region usage count (access under nommu_region_sem) */
|
||||
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
|
||||
@@ -325,6 +326,7 @@ struct vm_area_struct {
|
||||
@@ -310,6 +311,7 @@ struct vm_area_struct {
|
||||
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
|
||||
units */
|
||||
struct file * vm_file; /* File we map to (can be NULL). */
|
||||
|
@ -125,10 +125,10 @@ index 2161234..78aa367 100644
|
|||
|
||||
atomic_long_t swap_readahead_info;
|
||||
diff --git a/kernel/fork.c b/kernel/fork.c
|
||||
index a5d21c4..e965e09 100644
|
||||
index 1b27bab..382f45d 100644
|
||||
--- a/kernel/fork.c
|
||||
+++ b/kernel/fork.c
|
||||
@@ -473,7 +473,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
|
||||
@@ -504,7 +504,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
|
||||
struct inode *inode = file_inode(file);
|
||||
struct address_space *mapping = file->f_mapping;
|
||||
|
||||
|
@ -138,7 +138,7 @@ index a5d21c4..e965e09 100644
|
|||
atomic_dec(&inode->i_writecount);
|
||||
i_mmap_lock_write(mapping);
|
||||
diff --git a/mm/Makefile b/mm/Makefile
|
||||
index b4e54a9a..77892ae 100644
|
||||
index 8716bda..68afd6d 100644
|
||||
--- a/mm/Makefile
|
||||
+++ b/mm/Makefile
|
||||
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o \
|
||||
|
@ -151,11 +151,11 @@ index b4e54a9a..77892ae 100644
|
|||
obj-y += init-mm.o
|
||||
|
||||
diff --git a/mm/filemap.c b/mm/filemap.c
|
||||
index 0604cb0..45d2369 100644
|
||||
index 52517f2..250f675 100644
|
||||
--- a/mm/filemap.c
|
||||
+++ b/mm/filemap.c
|
||||
@@ -2700,7 +2700,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
|
||||
int ret = VM_FAULT_LOCKED;
|
||||
@@ -2700,7 +2700,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
|
||||
vm_fault_t ret = VM_FAULT_LOCKED;
|
||||
|
||||
sb_start_pagefault(inode->i_sb);
|
||||
- file_update_time(vmf->vma->vm_file);
|
||||
|
@ -164,7 +164,7 @@ index 0604cb0..45d2369 100644
|
|||
if (page->mapping != inode->i_mapping) {
|
||||
unlock_page(page);
|
||||
diff --git a/mm/mmap.c b/mm/mmap.c
|
||||
index fc41c05..e376869 100644
|
||||
index 17bbf4d..a31c3e1 100644
|
||||
--- a/mm/mmap.c
|
||||
+++ b/mm/mmap.c
|
||||
@@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
|
||||
|
@ -174,7 +174,7 @@ index fc41c05..e376869 100644
|
|||
- fput(vma->vm_file);
|
||||
+ vma_fput(vma);
|
||||
mpol_put(vma_policy(vma));
|
||||
kmem_cache_free(vm_area_cachep, vma);
|
||||
vm_area_free(vma);
|
||||
return next;
|
||||
@@ -905,7 +905,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
|
||||
if (remove_next) {
|
||||
|
@ -195,7 +195,7 @@ index fc41c05..e376869 100644
|
|||
|
||||
/* Undo any partial mapping done by a device driver. */
|
||||
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
|
||||
@@ -2645,7 +2645,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
|
||||
@@ -2640,7 +2640,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
|
||||
goto out_free_mpol;
|
||||
|
||||
if (new->vm_file)
|
||||
|
@ -204,7 +204,7 @@ index fc41c05..e376869 100644
|
|||
|
||||
if (new->vm_ops && new->vm_ops->open)
|
||||
new->vm_ops->open(new);
|
||||
@@ -2664,7 +2664,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
|
||||
@@ -2659,7 +2659,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
|
||||
if (new->vm_ops && new->vm_ops->close)
|
||||
new->vm_ops->close(new);
|
||||
if (new->vm_file)
|
||||
|
@ -213,16 +213,16 @@ index fc41c05..e376869 100644
|
|||
unlink_anon_vmas(new);
|
||||
out_free_mpol:
|
||||
mpol_put(vma_policy(new));
|
||||
@@ -2826,7 +2826,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
||||
@@ -2821,7 +2821,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
||||
struct vm_area_struct *vma;
|
||||
unsigned long populate = 0;
|
||||
unsigned long ret = -EINVAL;
|
||||
- struct file *file;
|
||||
+ struct file *file, *prfile;
|
||||
|
||||
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
|
||||
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
|
||||
current->comm, current->pid);
|
||||
@@ -2901,10 +2901,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
||||
@@ -2896,10 +2896,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -251,7 +251,7 @@ index fc41c05..e376869 100644
|
|||
out:
|
||||
up_write(&mm->mmap_sem);
|
||||
if (populate)
|
||||
@@ -3220,7 +3237,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
|
||||
@@ -3207,7 +3224,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
|
||||
if (anon_vma_clone(new_vma, vma))
|
||||
goto out_free_mempol;
|
||||
if (new_vma->vm_file)
|
||||
|
@ -261,7 +261,7 @@ index fc41c05..e376869 100644
|
|||
new_vma->vm_ops->open(new_vma);
|
||||
vma_link(mm, new_vma, prev, rb_link, rb_parent);
|
||||
diff --git a/mm/nommu.c b/mm/nommu.c
|
||||
index 1372373..6362dde 100644
|
||||
index 9fc9e43..25d4c49 100644
|
||||
--- a/mm/nommu.c
|
||||
+++ b/mm/nommu.c
|
||||
@@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm_region *region)
|
||||
|
@ -280,9 +280,9 @@ index 1372373..6362dde 100644
|
|||
- fput(vma->vm_file);
|
||||
+ vma_fput(vma);
|
||||
put_nommu_region(vma->vm_region);
|
||||
kmem_cache_free(vm_area_cachep, vma);
|
||||
vm_area_free(vma);
|
||||
}
|
||||
@@ -1289,7 +1289,7 @@ unsigned long do_mmap(struct file *file,
|
||||
@@ -1290,7 +1290,7 @@ unsigned long do_mmap(struct file *file,
|
||||
goto error_just_free;
|
||||
}
|
||||
}
|
||||
|
@ -291,7 +291,7 @@ index 1372373..6362dde 100644
|
|||
kmem_cache_free(vm_region_jar, region);
|
||||
region = pregion;
|
||||
result = start;
|
||||
@@ -1364,10 +1364,10 @@ unsigned long do_mmap(struct file *file,
|
||||
@@ -1365,7 +1365,7 @@ unsigned long do_mmap(struct file *file,
|
||||
up_write(&nommu_region_sem);
|
||||
error:
|
||||
if (region->vm_file)
|
||||
|
@ -299,11 +299,7 @@ index 1372373..6362dde 100644
|
|||
+ vmr_fput(region);
|
||||
kmem_cache_free(vm_region_jar, region);
|
||||
if (vma->vm_file)
|
||||
- fput(vma->vm_file);
|
||||
+ vma_fput(vma);
|
||||
kmem_cache_free(vm_area_cachep, vma);
|
||||
return ret;
|
||||
|
||||
fput(vma->vm_file);
|
||||
diff --git a/mm/prfile.c b/mm/prfile.c
|
||||
new file mode 100644
|
||||
index 0000000..a27ac36
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
aufs4.17 standalone patch
|
||||
aufs4.18 standalone patch
|
||||
|
||||
diff --git a/fs/dcache.c b/fs/dcache.c
|
||||
index ff338e2..3e2bae8 100644
|
||||
index 88a1514..e3f500a 100644
|
||||
--- a/fs/dcache.c
|
||||
+++ b/fs/dcache.c
|
||||
@@ -1342,6 +1342,7 @@ void d_walk(struct dentry *parent, void *data,
|
||||
|
@ -13,7 +13,7 @@ index ff338e2..3e2bae8 100644
|
|||
|
||||
struct check_mount {
|
||||
struct vfsmount *mnt;
|
||||
@@ -2942,6 +2943,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
|
||||
@@ -2890,6 +2891,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
|
||||
|
||||
write_sequnlock(&rename_lock);
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ index ff338e2..3e2bae8 100644
|
|||
/**
|
||||
* d_ancestor - search for an ancestor
|
||||
diff --git a/fs/exec.c b/fs/exec.c
|
||||
index 183059c..35adee4 100644
|
||||
index bdd0eac..edd3405 100644
|
||||
--- a/fs/exec.c
|
||||
+++ b/fs/exec.c
|
||||
@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
|
||||
|
@ -34,7 +34,7 @@ index 183059c..35adee4 100644
|
|||
#ifdef CONFIG_USELIB
|
||||
/*
|
||||
diff --git a/fs/fcntl.c b/fs/fcntl.c
|
||||
index 7550799..d403576 100644
|
||||
index 545e686..0237ad7 100644
|
||||
--- a/fs/fcntl.c
|
||||
+++ b/fs/fcntl.c
|
||||
@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
|
||||
|
@ -82,10 +82,10 @@ index 7ec0b3e..819ee07 100644
|
|||
void __init files_init(void)
|
||||
{
|
||||
diff --git a/fs/inode.c b/fs/inode.c
|
||||
index e0c5255..ff36056 100644
|
||||
index af894e7..169811b 100644
|
||||
--- a/fs/inode.c
|
||||
+++ b/fs/inode.c
|
||||
@@ -1672,6 +1672,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
|
||||
@@ -1658,6 +1658,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
|
||||
|
||||
return update_time(inode, time, flags);
|
||||
}
|
||||
|
@ -94,7 +94,7 @@ index e0c5255..ff36056 100644
|
|||
/**
|
||||
* touch_atime - update the access time
|
||||
diff --git a/fs/namespace.c b/fs/namespace.c
|
||||
index 61129ff..5d3e0382 100644
|
||||
index eb7cd21..c536458 100644
|
||||
--- a/fs/namespace.c
|
||||
+++ b/fs/namespace.c
|
||||
@@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
|
||||
|
@ -105,7 +105,7 @@ index 61129ff..5d3e0382 100644
|
|||
|
||||
/**
|
||||
* mnt_drop_write - give up write access to a mount
|
||||
@@ -851,6 +852,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
|
||||
@@ -860,6 +861,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
|
||||
{
|
||||
return check_mnt(real_mount(mnt));
|
||||
}
|
||||
|
@ -113,7 +113,7 @@ index 61129ff..5d3e0382 100644
|
|||
|
||||
/*
|
||||
* vfsmount lock must be held for write
|
||||
@@ -1893,6 +1895,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
|
||||
@@ -1917,6 +1919,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -122,7 +122,7 @@ index 61129ff..5d3e0382 100644
|
|||
static void cleanup_group_ids(struct mount *mnt, struct mount *end)
|
||||
{
|
||||
diff --git a/fs/notify/group.c b/fs/notify/group.c
|
||||
index b7a4b6a..5a69d60 100644
|
||||
index aa5468f2..b38d224 100644
|
||||
--- a/fs/notify/group.c
|
||||
+++ b/fs/notify/group.c
|
||||
@@ -22,6 +22,7 @@
|
||||
|
@ -158,18 +158,18 @@ index b7a4b6a..5a69d60 100644
|
|||
int fsnotify_fasync(int fd, struct file *file, int on)
|
||||
{
|
||||
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
|
||||
index e9191b4..1f8ccfa 100644
|
||||
index 61f4c5f..855c655 100644
|
||||
--- a/fs/notify/mark.c
|
||||
+++ b/fs/notify/mark.c
|
||||
@@ -108,6 +108,7 @@ void fsnotify_get_mark(struct fsnotify_mark *mark)
|
||||
WARN_ON_ONCE(!refcount_read(&mark->refcnt));
|
||||
refcount_inc(&mark->refcnt);
|
||||
@@ -245,6 +245,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
|
||||
queue_delayed_work(system_unbound_wq, &reaper_work,
|
||||
FSNOTIFY_REAPER_DELAY);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_put_mark);
|
||||
|
||||
static void __fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)
|
||||
{
|
||||
@@ -392,6 +393,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
|
||||
/*
|
||||
* Get mark reference when we found the mark via lockless traversal of object
|
||||
@@ -399,6 +400,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
|
||||
mutex_unlock(&group->mark_mutex);
|
||||
fsnotify_free_mark(mark);
|
||||
}
|
||||
|
@ -177,15 +177,15 @@ index e9191b4..1f8ccfa 100644
|
|||
|
||||
/*
|
||||
* Sorting function for lists of fsnotify marks.
|
||||
@@ -606,6 +608,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark, struct inode *inode,
|
||||
fsnotify_put_mark(mark);
|
||||
@@ -624,6 +626,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
|
||||
mutex_unlock(&group->mark_mutex);
|
||||
return ret;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_add_mark);
|
||||
|
||||
int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
|
||||
struct vfsmount *mnt, int allow_dups)
|
||||
@@ -741,6 +744,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
|
||||
/*
|
||||
* Given a list of marks, find the mark associated with given group. If found
|
||||
@@ -747,6 +750,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
|
||||
fsnotify_get_group(group);
|
||||
mark->group = group;
|
||||
}
|
||||
|
@ -214,7 +214,7 @@ index d0e955b..527bc1a 100644
|
|||
int open_check_o_direct(struct file *f)
|
||||
{
|
||||
diff --git a/fs/read_write.c b/fs/read_write.c
|
||||
index ddd6e67..aabf92d 100644
|
||||
index ccc5bc8..36f52f4 100644
|
||||
--- a/fs/read_write.c
|
||||
+++ b/fs/read_write.c
|
||||
@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
|
||||
|
@ -250,10 +250,10 @@ index ddd6e67..aabf92d 100644
|
|||
static inline loff_t file_pos_read(struct file *file)
|
||||
{
|
||||
diff --git a/fs/splice.c b/fs/splice.c
|
||||
index f617ab0..ec0ad02 100644
|
||||
index 1dd7f96..a5e3bcb 100644
|
||||
--- a/fs/splice.c
|
||||
+++ b/fs/splice.c
|
||||
@@ -850,6 +850,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
@@ -851,6 +851,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
||||
|
||||
return splice_write(pipe, out, ppos, len, flags);
|
||||
}
|
||||
|
@ -261,7 +261,7 @@ index f617ab0..ec0ad02 100644
|
|||
|
||||
/*
|
||||
* Attempt to initiate a splice from a file to a pipe.
|
||||
@@ -879,6 +880,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
|
||||
@@ -880,6 +881,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
|
||||
|
||||
return splice_read(in, ppos, pipe, len, flags);
|
||||
}
|
||||
|
@ -282,10 +282,10 @@ index 2860782..ffd7ea4 100644
|
|||
/*
|
||||
* Write out and wait upon all dirty data associated with this
|
||||
diff --git a/fs/xattr.c b/fs/xattr.c
|
||||
index 61cd28b..35570cd 100644
|
||||
index f9cb1db..000b62b 100644
|
||||
--- a/fs/xattr.c
|
||||
+++ b/fs/xattr.c
|
||||
@@ -297,6 +297,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
|
||||
@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
|
||||
*xattr_value = value;
|
||||
return error;
|
||||
}
|
||||
|
@ -294,7 +294,7 @@ index 61cd28b..35570cd 100644
|
|||
ssize_t
|
||||
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
|
||||
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
|
||||
index 06e0d7a..6af91bd 100644
|
||||
index 720f070..4f58215 100644
|
||||
--- a/kernel/locking/lockdep.c
|
||||
+++ b/kernel/locking/lockdep.c
|
||||
@@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
|
||||
|
@ -315,10 +315,10 @@ index 0fef395..83fb1ec 100644
|
|||
}
|
||||
+EXPORT_SYMBOL_GPL(task_work_run);
|
||||
diff --git a/security/commoncap.c b/security/commoncap.c
|
||||
index 1ce701f..a0d106e 100644
|
||||
index f4c33ab..70563f1 100644
|
||||
--- a/security/commoncap.c
|
||||
+++ b/security/commoncap.c
|
||||
@@ -1332,12 +1332,14 @@ int cap_mmap_addr(unsigned long addr)
|
||||
@@ -1336,12 +1336,14 @@ int cap_mmap_addr(unsigned long addr)
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
@ -334,7 +334,7 @@ index 1ce701f..a0d106e 100644
|
|||
#ifdef CONFIG_SECURITY
|
||||
|
||||
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
|
||||
index c65b39b..e363d22 100644
|
||||
index cd97929..424fd23 100644
|
||||
--- a/security/device_cgroup.c
|
||||
+++ b/security/device_cgroup.c
|
||||
@@ -8,6 +8,7 @@
|
||||
|
@ -351,7 +351,7 @@ index c65b39b..e363d22 100644
|
|||
}
|
||||
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
|
||||
diff --git a/security/security.c b/security/security.c
|
||||
index 7bc2fde..6bd0468 100644
|
||||
index 68f46d8..3bc1348 100644
|
||||
--- a/security/security.c
|
||||
+++ b/security/security.c
|
||||
@@ -537,6 +537,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,8 @@
|
|||
#!/bin/sh
|
||||
for _kurtar in \
|
||||
'/boot/grub' ; \
|
||||
do
|
||||
# -sz ve -g den sonra /tmp/$paket.sil dikkate alınır
|
||||
sed -i '\|'\'$_kurtar\''|d' /tmp/kernel.sil
|
||||
|
||||
done
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
surum=4.17.14
|
||||
surum=4.18.12
|
||||
sonek=milis
|
||||
depmod ${surum}-$sonek
|
||||
cd /boot
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
# Grup: sistem
|
||||
|
||||
isim=kernel
|
||||
_basekernel=4.17
|
||||
surum=4.17.14
|
||||
_basekernel=4.18
|
||||
surum=4.18.12
|
||||
devir=1
|
||||
|
||||
kaynak=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-$_basekernel.tar.xz
|
||||
|
@ -61,7 +61,7 @@ derle() {
|
|||
yes "" | make oldconfig >/dev/null
|
||||
|
||||
# derleme
|
||||
make ${MAKEFLAGS} bzImage modules || make ${MAKEFLAGS} bzImage modules
|
||||
make -j1 bzImage modules || make -j1 bzImage modules
|
||||
|
||||
KARCH=x86
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
|
||||
index 73b5e65..0185e47 100644
|
||||
index f155dc6..ed9ec5b 100644
|
||||
--- a/include/linux/shmem_fs.h
|
||||
+++ b/include/linux/shmem_fs.h
|
||||
@@ -25,10 +25,13 @@ struct shmem_inode_info {
|
||||
|
@ -20,7 +20,7 @@ index 73b5e65..0185e47 100644
|
|||
umode_t mode; /* Mount mode for root directory */
|
||||
unsigned char huge; /* Whether to try for hugepages */
|
||||
diff --git a/mm/shmem.c b/mm/shmem.c
|
||||
index 9d6c7e5..d2f0cc8 100644
|
||||
index 41b9bbf..3b4b410 100644
|
||||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -111,9 +111,13 @@ static unsigned long shmem_default_max_blocks(void)
|
||||
|
@ -39,7 +39,7 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
}
|
||||
#endif
|
||||
|
||||
@@ -1091,6 +1095,11 @@ static void shmem_evict_inode(struct inode *inode)
|
||||
@@ -1105,6 +1109,11 @@ static void shmem_evict_inode(struct inode *inode)
|
||||
|
||||
simple_xattrs_free(&info->xattrs);
|
||||
WARN_ON(inode->i_blocks);
|
||||
|
@ -51,7 +51,7 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
shmem_free_inode(inode->i_sb);
|
||||
clear_inode(inode);
|
||||
}
|
||||
@@ -2162,13 +2171,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
|
||||
@@ -2178,13 +2187,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
|
||||
struct inode *inode;
|
||||
struct shmem_inode_info *info;
|
||||
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
|
||||
|
@ -66,10 +66,10 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
inode_init_owner(inode, dir, mode);
|
||||
inode->i_blocks = 0;
|
||||
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
|
||||
@@ -2210,6 +2219,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
|
||||
mpol_shared_policy_init(&info->policy, NULL);
|
||||
break;
|
||||
@@ -2226,6 +2235,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
|
||||
}
|
||||
|
||||
lockdep_annotate_inode_mutex_key(inode);
|
||||
+
|
||||
+ if (!sbinfo->idr_nouse) {
|
||||
+ /* inum 0 and 1 are unused */
|
||||
|
@ -92,7 +92,7 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
} else
|
||||
shmem_free_inode(sb);
|
||||
return inode;
|
||||
@@ -3423,8 +3451,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
|
||||
@@ -3205,8 +3233,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
|
||||
static int shmem_match(struct inode *ino, void *vfh)
|
||||
{
|
||||
__u32 *fh = vfh;
|
||||
|
@ -102,7 +102,7 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
return ino->i_ino == inum && fh[0] == ino->i_generation;
|
||||
}
|
||||
|
||||
@@ -3435,14 +3462,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
|
||||
@@ -3226,14 +3253,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
|
||||
struct dentry *dentry = NULL;
|
||||
u64 inum;
|
||||
|
||||
|
@ -118,9 +118,9 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
+ inum = fid->raw[1];
|
||||
+ inode = ilookup5(sb, inum, shmem_match, fid->raw);
|
||||
if (inode) {
|
||||
dentry = d_find_alias(inode);
|
||||
dentry = shmem_find_alias(inode);
|
||||
iput(inode);
|
||||
@@ -3454,30 +3478,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
|
||||
@@ -3245,30 +3269,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
|
||||
static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len,
|
||||
struct inode *parent)
|
||||
{
|
||||
|
@ -154,7 +154,7 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
return 1;
|
||||
}
|
||||
|
||||
@@ -3541,7 +3550,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
|
||||
@@ -3332,7 +3341,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
|
||||
goto bad_val;
|
||||
} else if (!strcmp(this_char,"nr_inodes")) {
|
||||
sbinfo->max_inodes = memparse(value, &rest);
|
||||
|
@ -163,7 +163,7 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
goto bad_val;
|
||||
} else if (!strcmp(this_char,"mode")) {
|
||||
if (remount)
|
||||
@@ -3606,7 +3615,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
|
||||
@@ -3397,7 +3406,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
|
||||
{
|
||||
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
|
||||
struct shmem_sb_info config = *sbinfo;
|
||||
|
@ -172,16 +172,7 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
int error = -EINVAL;
|
||||
|
||||
config.mpol = NULL;
|
||||
@@ -3655,7 +3664,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
|
||||
seq_printf(seq, ",size=%luk",
|
||||
sbinfo->max_blocks << (PAGE_SHIFT - 10));
|
||||
if (sbinfo->max_inodes != shmem_default_max_inodes())
|
||||
- seq_printf(seq, ",nr_inodes=%lu", sbinfo->max_inodes);
|
||||
+ seq_printf(seq, ",nr_inodes=%d", sbinfo->max_inodes);
|
||||
if (sbinfo->mode != (S_IRWXUGO | S_ISVTX))
|
||||
seq_printf(seq, ",mode=%03ho", sbinfo->mode);
|
||||
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
|
||||
@@ -3766,6 +3775,8 @@ static void shmem_put_super(struct super_block *sb)
|
||||
@@ -3470,6 +3479,8 @@ static void shmem_put_super(struct super_block *sb)
|
||||
{
|
||||
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
|
||||
|
||||
|
@ -190,16 +181,16 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
percpu_counter_destroy(&sbinfo->used_blocks);
|
||||
mpol_put(sbinfo->mpol);
|
||||
kfree(sbinfo);
|
||||
@@ -3784,6 +3795,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
|
||||
@@ -3488,6 +3499,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
|
||||
if (!sbinfo)
|
||||
return -ENOMEM;
|
||||
|
||||
+ mutex_init(&sbinfo->idr_lock);
|
||||
+ idr_init(&sbinfo->idr);
|
||||
sbinfo->mode = S_IRWXUGO | S_ISVTX;
|
||||
sbinfo->mode = 0777 | S_ISVTX;
|
||||
sbinfo->uid = current_fsuid();
|
||||
sbinfo->gid = current_fsgid();
|
||||
@@ -3891,6 +3904,15 @@ static void shmem_destroy_inodecache(void)
|
||||
@@ -3595,6 +3608,15 @@ static void shmem_destroy_inodecache(void)
|
||||
kmem_cache_destroy(shmem_inode_cachep);
|
||||
}
|
||||
|
||||
|
@ -215,7 +206,7 @@ index 9d6c7e5..d2f0cc8 100644
|
|||
static const struct address_space_operations shmem_aops = {
|
||||
.writepage = shmem_writepage,
|
||||
.set_page_dirty = __set_page_dirty_no_writeback,
|
||||
@@ -4021,6 +4043,7 @@ int __init shmem_init(void)
|
||||
@@ -3725,6 +3747,7 @@ int __init shmem_init(void)
|
||||
pr_err("Could not kern_mount tmpfs\n");
|
||||
goto out1;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
SPDX-License-Identifier: GPL-2.0
|
||||
diff --git a/fs/inode.c b/fs/inode.c
|
||||
index 3b55391..94924d2 100644
|
||||
index 8c86c80..63175ca 100644
|
||||
--- a/fs/inode.c
|
||||
+++ b/fs/inode.c
|
||||
@@ -861,6 +861,8 @@ unsigned int get_next_ino(void)
|
||||
|
|
Loading…
Reference in New Issue