Skip to content

Commit

Permalink
aufs4.4 20170220
Browse files Browse the repository at this point in the history
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
  • Loading branch information
sfjro committed Feb 15, 2017
1 parent cf4d76e commit c02a22f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions aufs4-loopback.patch
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ index fb2237c..c3888c5 100644
unsigned lo_blocksize;
void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
index a2256c7..6f03771 100644
index dc8c529..cd1acc5 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
@@ -348,7 +348,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
Expand All @@ -193,7 +193,7 @@ index a2256c7..6f03771 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 c3ca50f..a3dbdaf 100644
index 61e9197..9910bea 100644
--- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c
@@ -132,3 +132,19 @@ void au_loopback_fin(void)
Expand All @@ -217,7 +217,7 @@ index c3ca50f..a3dbdaf 100644
+ return f;
+}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
index 48bf070..66afec7 100644
index e2df495..36e5052 100644
--- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h
@@ -25,7 +25,11 @@ void au_warn_loopback(struct super_block *h_sb);
Expand All @@ -242,7 +242,7 @@ index 48bf070..66afec7 100644

#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
index 833977e..2e1829f 100644
index c4a210d..df6e8cf 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
@@ -837,7 +837,10 @@ static const struct super_operations aufs_sop = {
Expand Down
2 changes: 1 addition & 1 deletion include/uapi/linux/aufs_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include <linux/limits.h>

#define AUFS_VERSION "4.4-20170206"
#define AUFS_VERSION "4.4-20170220"

/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
Expand Down

0 comments on commit c02a22f

Please sign in to comment.