Skip to content

GitLab

Commit 85cc5c43 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

aufs5.2 20200120 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 500e4709
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 85cc5c43
...@@ -68,7 +68,7 @@ index c435398f2c81..a688a042d022 100644 ...@@ -68,7 +68,7 @@ index c435398f2c81..a688a042d022 100644
{ {
struct dentry *this_parent; struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index 3d40771e8e7c..d62303c5472a 100644 index 3d40771e8e7c..12dd73930961 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
...@@ -76,7 +76,7 @@ index 3d40771e8e7c..d62303c5472a 100644 ...@@ -76,7 +76,7 @@ index 3d40771e8e7c..d62303c5472a 100644
#define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
-static int setfl(int fd, struct file * filp, unsigned long arg) -static int setfl(int fd, struct file * filp, unsigned long arg)
+int setfl(int fd, struct file * filp, unsigned long arg) +int setfl(int fd, struct file *filp, unsigned long arg)
{ {
struct inode * inode = file_inode(filp); struct inode * inode = file_inode(filp);
int error = 0; int error = 0;
...@@ -120,7 +120,7 @@ index 6fbc9126367a..101dda59f39c 100644 ...@@ -120,7 +120,7 @@ index 6fbc9126367a..101dda59f39c 100644
* vfsmount lock must be held for write * vfsmount lock must be held for write
*/ */
diff --git a/fs/read_write.c b/fs/read_write.c diff --git a/fs/read_write.c b/fs/read_write.c
index c543d965e288..35ab54e0a994 100644 index c543d965e288..afaa864c0315 100644
--- a/fs/read_write.c --- a/fs/read_write.c
+++ b/fs/read_write.c +++ b/fs/read_write.c
@@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p, @@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
...@@ -135,7 +135,7 @@ index c543d965e288..35ab54e0a994 100644 ...@@ -135,7 +135,7 @@ index c543d965e288..35ab54e0a994 100644
+ return fop->read; + return fop->read;
+ if (fop->read_iter) + if (fop->read_iter)
+ return new_sync_read; + return new_sync_read;
+ return ERR_PTR(-ENOSYS); + return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */
+} +}
+ +
+vfs_writef_t vfs_writef(struct file *file) +vfs_writef_t vfs_writef(struct file *file)
...@@ -146,7 +146,7 @@ index c543d965e288..35ab54e0a994 100644 ...@@ -146,7 +146,7 @@ index c543d965e288..35ab54e0a994 100644
+ return fop->write; + return fop->write;
+ if (fop->write_iter) + if (fop->write_iter)
+ return new_sync_write; + return new_sync_write;
+ return ERR_PTR(-ENOSYS); + return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */
+} +}
+ +
ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos) ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
...@@ -194,14 +194,14 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644 ...@@ -194,14 +194,14 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644
if (wait) if (wait)
sync_inodes_sb(sb); sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index f7fdfe93e25d..28593b894e7b 100644 index f7fdfe93e25d..7766f2467e4e 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1333,6 +1333,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1333,6 +1333,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */ /* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int); extern void kill_fasync(struct fasync_struct **, int, int);
+extern int setfl(int fd, struct file * filp, unsigned long arg); +extern int setfl(int fd, struct file *filp, unsigned long arg);
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); 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 int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp); extern void f_delown(struct file *filp);
......
aufs5-loopback.patch
View file @ 85cc5c43
...@@ -140,7 +140,7 @@ index 1b723737592b..16561a96019c 100644 ...@@ -140,7 +140,7 @@ index 1b723737592b..16561a96019c 100644
} }
diff --git a/drivers/block/loop.h b/drivers/block/loop.h diff --git a/drivers/block/loop.h b/drivers/block/loop.h
index af75a5ee4094..1e6ee5a4f623 100644 index af75a5ee4094..1d847cb194ff 100644
--- a/drivers/block/loop.h --- a/drivers/block/loop.h
+++ b/drivers/block/loop.h +++ b/drivers/block/loop.h
@@ -46,7 +46,7 @@ struct loop_device { @@ -46,7 +46,7 @@ struct loop_device {
...@@ -148,12 +148,12 @@ index af75a5ee4094..1e6ee5a4f623 100644 ...@@ -148,12 +148,12 @@ index af75a5ee4094..1e6ee5a4f623 100644
unsigned long arg); unsigned long arg);
- struct file * lo_backing_file; - struct file * lo_backing_file;
+ struct file * lo_backing_file, *lo_backing_virt_file; + struct file *lo_backing_file, *lo_backing_virt_file;
struct block_device *lo_device; struct block_device *lo_device;
void *key_data; void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
index 0309f0d502ff..19feb4f3cb5f 100644 index 240509add504..ae374ce4ded7 100644
--- a/fs/aufs/f_op.c --- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c +++ b/fs/aufs/f_op.c
@@ -359,7 +359,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)
...@@ -212,7 +212,7 @@ index f31e40aff267..e13fb1a0717a 100644 ...@@ -212,7 +212,7 @@ index f31e40aff267..e13fb1a0717a 100644
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c diff --git a/fs/aufs/super.c b/fs/aufs/super.c
index a97e2921cb09..f74eb6962684 100644 index 95df083a5888..2db407f441fe 100644
--- a/fs/aufs/super.c --- a/fs/aufs/super.c
+++ b/fs/aufs/super.c +++ b/fs/aufs/super.c
@@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = { @@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
...@@ -228,14 +228,14 @@ index a97e2921cb09..f74eb6962684 100644 ...@@ -228,14 +228,14 @@ index a97e2921cb09..f74eb6962684 100644
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index 28593b894e7b..bdc2611787df 100644 index 7766f2467e4e..7ec1262de275 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1947,6 +1947,10 @@ struct super_operations { @@ -1947,6 +1947,10 @@ struct super_operations {
struct shrink_control *); struct shrink_control *);
long (*free_cached_objects)(struct super_block *, long (*free_cached_objects)(struct super_block *,
struct shrink_control *); struct shrink_control *);
+#if defined(CONFIG_BLK_DEV_LOOP) || defined(CONFIG_BLK_DEV_LOOP_MODULE) +#if IS_ENABLED(CONFIG_BLK_DEV_LOOP) || IS_ENABLED(CONFIG_BLK_DEV_LOOP_MODULE)
+ /* and aufs */ + /* and aufs */
+ struct file *(*real_loop)(struct file *); + struct file *(*real_loop)(struct file *);
+#endif +#endif
......
aufs5-standalone.patch
View file @ 85cc5c43
...@@ -34,10 +34,10 @@ index 89a500bb897a..1a722915ed77 100644 ...@@ -34,10 +34,10 @@ index 89a500bb897a..1a722915ed77 100644
#ifdef CONFIG_USELIB #ifdef CONFIG_USELIB
/* /*
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index d62303c5472a..d4ad34463848 100644 index 12dd73930961..0468c845190f 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg) @@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
out: out:
return error; return error;
} }
...@@ -190,7 +190,7 @@ index b5b80469b93d..eb818f6b9519 100644 ...@@ -190,7 +190,7 @@ index b5b80469b93d..eb818f6b9519 100644
long vfs_truncate(const struct path *path, loff_t length) long vfs_truncate(const struct path *path, loff_t length)
{ {
diff --git a/fs/read_write.c b/fs/read_write.c diff --git a/fs/read_write.c b/fs/read_write.c
index 35ab54e0a994..9da238d64ea4 100644 index afaa864c0315..9ce57246d390 100644
--- a/fs/read_write.c --- a/fs/read_write.c
+++ b/fs/read_write.c +++ b/fs/read_write.c
@@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) @@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
...@@ -203,7 +203,7 @@ index 35ab54e0a994..9da238d64ea4 100644 ...@@ -203,7 +203,7 @@ index 35ab54e0a994..9da238d64ea4 100644
{ {
@@ -508,6 +509,7 @@ vfs_readf_t vfs_readf(struct file *file) @@ -508,6 +509,7 @@ vfs_readf_t vfs_readf(struct file *file)
return new_sync_read; return new_sync_read;
return ERR_PTR(-ENOSYS); return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */
} }
+EXPORT_SYMBOL_GPL(vfs_readf); +EXPORT_SYMBOL_GPL(vfs_readf);
...@@ -211,7 +211,7 @@ index 35ab54e0a994..9da238d64ea4 100644 ...@@ -211,7 +211,7 @@ index 35ab54e0a994..9da238d64ea4 100644
{ {
@@ -519,6 +521,7 @@ vfs_writef_t vfs_writef(struct file *file) @@ -519,6 +521,7 @@ vfs_writef_t vfs_writef(struct file *file)
return new_sync_write; return new_sync_write;
return ERR_PTR(-ENOSYS); return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */
} }
+EXPORT_SYMBOL_GPL(vfs_writef); +EXPORT_SYMBOL_GPL(vfs_writef);
......
include/uapi/linux/aufs_type.h
View file @ 85cc5c43
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.2" #define AUFS_VERSION "5.2-20200120"
/* todo? move this to linux-2.6.19/include/magic.h */ /* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
lockdep-debug.patch
View file @ 85cc5c43
...@@ -15,17 +15,9 @@ index 5a945d18a72a..c6def416ec11 100644 ...@@ -15,17 +15,9 @@ index 5a945d18a72a..c6def416ec11 100644
#include <linux/types.h> #include <linux/types.h>
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 67dccde036a2..7344fb25a11f 100644 index 67dccde036a2..da3f730a6de2 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -4587,6 +4593,7 @@ void lockdep_reset(void)
INIT_HLIST_HEAD(chainhash_table + i);
raw_local_irq_restore(flags);
}
+/* EXPORT_SYMBOL_GPL(lock_reset); */
/* Remove a class from a lock chain. Must be called with the graph lock held. */
static void remove_class_from_lock_chain(struct pending_free *pf,
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index 150ec3f0c5b5..e65c1d0b1ac1 100644 index 150ec3f0c5b5..e65c1d0b1ac1 100644
--- a/kernel/locking/lockdep_internals.h --- a/kernel/locking/lockdep_internals.h
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment