Skip to content

GitLab

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

Merge branch 'aufs5.8/01modular' into aufs5.8/30stdalone

parents bdf79a74 16bb9c78
Show whitespace changes
Inline Side-by-side
fs/aufs/dynop.c
View file @ 2a83fb94
...@@ -180,6 +180,7 @@ static void dy_aop(struct au_dykey *key, const void *h_op, ...@@ -180,6 +180,7 @@ static void dy_aop(struct au_dykey *key, const void *h_op,
DySetAop(writepages); DySetAop(writepages);
DySetAop(set_page_dirty); DySetAop(set_page_dirty);
DySetAop(readpages); DySetAop(readpages);
DySetAop(readahead);
DySetAop(write_begin); DySetAop(write_begin);
DySetAop(write_end); DySetAop(write_end);
DySetAop(bmap); DySetAop(bmap);
......
include/uapi/linux/aufs_type.h
View file @ 2a83fb94
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN" #define AUFS_VERSION "5.8"
/* 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