Skip to content

GitLab

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

aufs5.x-rcN 20190812 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 79d82162
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ dbd6a129
...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index 6426db5198f0..332a330a8614 100644 index a2c343ee3b2c..1ee4be465c71 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2818,6 +2818,19 @@ F: include/linux/audit.h @@ -2822,6 +2822,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h F: include/uapi/linux/audit.h
F: kernel/audit* F: kernel/audit*
...@@ -26,7 +26,7 @@ index 6426db5198f0..332a330a8614 100644 ...@@ -26,7 +26,7 @@ index 6426db5198f0..332a330a8614 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com> M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 44c9985f352a..fc0584d8b8fd 100644 index 3036883fc9f8..a07d1ffa9347 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
...@@ -194,7 +194,7 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644 ...@@ -194,7 +194,7 @@ 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 56b8e358af5c..5e914b18a5a2 100644 index 997a530ff4e9..3dbec51c2037 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1331,6 +1331,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1331,6 +1331,7 @@ extern void fasync_free(struct fasync_struct *);
......
aufs5-loopback.patch
View file @ dbd6a129
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN loopback patch aufs5.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index fc0584d8b8fd..07e358fffcdb 100644 index a07d1ffa9347..aef053ace086 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -625,6 +625,15 @@ static inline void loop_update_dio(struct loop_device *lo) @@ -625,6 +625,15 @@ static inline void loop_update_dio(struct loop_device *lo)
...@@ -83,8 +83,8 @@ index fc0584d8b8fd..07e358fffcdb 100644 ...@@ -83,8 +83,8 @@ index fc0584d8b8fd..07e358fffcdb 100644
+ struct file *file, *f, *virt_file = NULL; + struct file *file, *f, *virt_file = NULL;
struct inode *inode; struct inode *inode;
struct address_space *mapping; struct address_space *mapping;
int lo_flags = 0; struct block_device *claimed_bdev = NULL;
@@ -954,6 +976,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, @@ -955,6 +977,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
file = fget(arg); file = fget(arg);
if (!file) if (!file)
goto out; goto out;
...@@ -97,7 +97,7 @@ index fc0584d8b8fd..07e358fffcdb 100644 ...@@ -97,7 +97,7 @@ index fc0584d8b8fd..07e358fffcdb 100644
/* /*
* If we don't hold exclusive handle for the device, upgrade to it * If we don't hold exclusive handle for the device, upgrade to it
@@ -1001,6 +1029,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, @@ -1003,6 +1031,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->lo_device = bdev; lo->lo_device = bdev;
lo->lo_flags = lo_flags; lo->lo_flags = lo_flags;
lo->lo_backing_file = file; lo->lo_backing_file = file;
...@@ -105,8 +105,8 @@ index fc0584d8b8fd..07e358fffcdb 100644 ...@@ -105,8 +105,8 @@ index fc0584d8b8fd..07e358fffcdb 100644
lo->transfer = NULL; lo->transfer = NULL;
lo->ioctl = NULL; lo->ioctl = NULL;
lo->lo_sizelimit = 0; lo->lo_sizelimit = 0;
@@ -1044,6 +1073,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, @@ -1046,6 +1075,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
blkdev_put(bdev, mode | FMODE_EXCL); bd_abort_claiming(bdev, claimed_bdev, loop_set_fd);
out_putf: out_putf:
fput(file); fput(file);
+ if (virt_file) + if (virt_file)
...@@ -114,7 +114,7 @@ index fc0584d8b8fd..07e358fffcdb 100644 ...@@ -114,7 +114,7 @@ index fc0584d8b8fd..07e358fffcdb 100644
out: out:
/* This is safe: open() is still holding a reference. */ /* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE); module_put(THIS_MODULE);
@@ -1090,6 +1121,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer, @@ -1092,6 +1123,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
static int __loop_clr_fd(struct loop_device *lo, bool release) static int __loop_clr_fd(struct loop_device *lo, bool release)
{ {
struct file *filp = NULL; struct file *filp = NULL;
...@@ -122,7 +122,7 @@ index fc0584d8b8fd..07e358fffcdb 100644 ...@@ -122,7 +122,7 @@ index fc0584d8b8fd..07e358fffcdb 100644
gfp_t gfp = lo->old_gfp_mask; gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device; struct block_device *bdev = lo->lo_device;
int err = 0; int err = 0;
@@ -1113,6 +1145,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) @@ -1115,6 +1147,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock); spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL; lo->lo_backing_file = NULL;
...@@ -130,7 +130,7 @@ index fc0584d8b8fd..07e358fffcdb 100644 ...@@ -130,7 +130,7 @@ index fc0584d8b8fd..07e358fffcdb 100644
spin_unlock_irq(&lo->lo_lock); spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo); loop_release_xfer(lo);
@@ -1195,6 +1228,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) @@ -1197,6 +1230,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/ */
if (filp) if (filp)
fput(filp); fput(filp);
...@@ -228,7 +228,7 @@ index a97e2921cb09..f74eb6962684 100644 ...@@ -228,7 +228,7 @@ 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 5e914b18a5a2..22213471e105 100644 index 3dbec51c2037..38ab7b6c7c6d 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1948,6 +1948,10 @@ struct super_operations { @@ -1948,6 +1948,10 @@ struct super_operations {
......
aufs5-mmap.patch
View file @ dbd6a129
...@@ -138,7 +138,7 @@ index 2852d0e76ea3..7b7f676b6465 100644 ...@@ -138,7 +138,7 @@ index 2852d0e76ea3..7b7f676b6465 100644
atomic_dec(&inode->i_writecount); atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping); i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile diff --git a/mm/Makefile b/mm/Makefile
index 338e528ad436..ee91e8c78606 100644 index d0b295c3b764..6156cd3d1ab0 100644
--- a/mm/Makefile --- a/mm/Makefile
+++ b/mm/Makefile +++ b/mm/Makefile
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ @@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
......
include/uapi/linux/aufs_type.h
View file @ dbd6a129
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <linux/limits.h> #include <linux/limits.h>
#define AUFS_VERSION "5.x-rcN-20190805" #define AUFS_VERSION "5.x-rcN-20190812"
/* 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')
......
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