aufs5.1 20200120

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

aufs5-base.patch

@@ -68,7 +68,7 @@ index aac41adf4743..fc18967c2522 100644
  {
  	struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 083185174c6d..78234ee16784 100644
+index 083185174c6d..7828d53148a7 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -32,7 +32,7 @@
@@ -76,7 +76,7 @@ index 083185174c6d..78234ee16784 100644
  #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
  
 -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);
  	int error = 0;
@@ -120,7 +120,7 @@ index c9cab307fa77..e56de0b2bee0 100644
   * vfsmount lock must be held for write
   */
 diff --git a/fs/read_write.c b/fs/read_write.c
-index 61b43ad7608e..8979e01e9bf0 100644
+index 61b43ad7608e..e1e66b631a1a 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 @@ -489,6 +489,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
@@ -135,7 +135,7 @@ index 61b43ad7608e..8979e01e9bf0 100644
 +		return fop->read;
 +	if (fop->read_iter)
 +		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)
@@ -146,7 +146,7 @@ index 61b43ad7608e..8979e01e9bf0 100644
 +		return fop->write;
 +	if (fop->write_iter)
 +		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)
@@ -194,14 +194,14 @@ index b54e0541ad89..28607828e96f 100644
  	if (wait)
  		sync_inodes_sb(sb);
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index dd28e7679089..77933034b50a 100644
+index dd28e7679089..4e81cae7cdac 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -1327,6 +1327,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  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 int f_setown(struct file *filp, unsigned long arg, int force);
  extern void f_delown(struct file *filp);

aufs5-loopback.patch

@@ -140,7 +140,7 @@ index 7e18c8c72dcc..33f8813e97d6 100644
  }
  
 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
 +++ b/drivers/block/loop.h
 @@ -46,7 +46,7 @@ struct loop_device {
@@ -148,12 +148,12 @@ index af75a5ee4094..1e6ee5a4f623 100644
  				 unsigned long arg); 
  
 -	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;
  	void		*key_data; 
  
 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
 +++ b/fs/aufs/f_op.c
 @@ -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
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 73255f63b80c..f04e211cbf89 100644
+index 97e1401359d8..514678aa1af3 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -846,7 +846,10 @@ static const struct super_operations aufs_sop = {
@@ -228,14 +228,14 @@ index 73255f63b80c..f04e211cbf89 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 77933034b50a..9a9b195fb847 100644
+index 4e81cae7cdac..0d7ebed99cb7 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -1940,6 +1940,10 @@ struct super_operations {
  				  struct shrink_control *);
  	long (*free_cached_objects)(struct super_block *,
  				    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 */
 +	struct file *(*real_loop)(struct file *);
 +#endif

aufs5-standalone.patch

@@ -34,10 +34,10 @@ index 2e0033348d8e..bd946a5b9b1e 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 78234ee16784..2072f690b121 100644
+index 7828d53148a7..efd8e2e9c0fa 100644
 --- a/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:
  	return error;
  }
@@ -190,7 +190,7 @@ index a00350018a47..fc17a6a34071 100644
  long vfs_truncate(const struct path *path, loff_t length)
  {
 diff --git a/fs/read_write.c b/fs/read_write.c
-index 8979e01e9bf0..50fb9b2d1418 100644
+index e1e66b631a1a..ed36db32507f 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)
@@ -203,7 +203,7 @@ index 8979e01e9bf0..50fb9b2d1418 100644
  {
 @@ -499,6 +500,7 @@ vfs_readf_t vfs_readf(struct file *file)
  		return new_sync_read;
- 	return ERR_PTR(-ENOSYS);
+ 	return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */
  }
 +EXPORT_SYMBOL_GPL(vfs_readf);
  
@@ -211,7 +211,7 @@ index 8979e01e9bf0..50fb9b2d1418 100644
  {
 @@ -510,6 +512,7 @@ vfs_writef_t vfs_writef(struct file *file)
  		return new_sync_write;
- 	return ERR_PTR(-ENOSYS);
+ 	return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */
  }
 +EXPORT_SYMBOL_GPL(vfs_writef);
  

include/uapi/linux/aufs_type.h

@@ -40,7 +40,7 @@
 #include <limits.h>
 #endif /* __KERNEL__ */
 
-#define AUFS_VERSION	"5.1"
+#define AUFS_VERSION	"5.1-20200120"
 
 /* todo? move this to linux-2.6.19/include/magic.h */
 #define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

lockdep-debug.patch

@@ -15,17 +15,9 @@ index 470795d9f4a2..42bf321d9181 100644
  #include <linux/types.h>
  
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 92de98d9c634..0d2eeaa651e4 100644
+index 92de98d9c634..82764fbac637 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -4495,6 +4501,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
 index d4c197425f68..a103700a63bd 100644
 --- a/kernel/locking/lockdep_internals.h