Replace aufs with overlayfs
svn path=/dists/trunk/linux/; revision=22150
This commit is contained in:
parent
dff5dedd0f
commit
af98d628cc
|
@ -2,6 +2,10 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
* New upstream release: http://kernelnewbies.org/Linux_3.18
|
* New upstream release: http://kernelnewbies.org/Linux_3.18
|
||||||
|
|
||||||
|
[ Ben Hutchings ]
|
||||||
|
* Remove aufs
|
||||||
|
* vfs: Enable OVERLAY_FS as module
|
||||||
|
|
||||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 09 Dec 2014 02:08:47 +0000
|
-- Ben Hutchings <ben@decadent.org.uk> Tue, 09 Dec 2014 02:08:47 +0000
|
||||||
|
|
||||||
linux (3.17.4-1~exp1) experimental; urgency=medium
|
linux (3.17.4-1~exp1) experimental; urgency=medium
|
||||||
|
|
|
@ -4435,26 +4435,6 @@ CONFIG_AFS_FS=m
|
||||||
# CONFIG_AFS_DEBUG is not set
|
# CONFIG_AFS_DEBUG is not set
|
||||||
CONFIG_AFS_FSCACHE=y
|
CONFIG_AFS_FSCACHE=y
|
||||||
|
|
||||||
##
|
|
||||||
## file: fs/aufs/Kconfig
|
|
||||||
##
|
|
||||||
CONFIG_AUFS_FS=m
|
|
||||||
## choice: Maximum number of branches
|
|
||||||
CONFIG_AUFS_BRANCH_MAX_127=y
|
|
||||||
# CONFIG_AUFS_BRANCH_MAX_511 is not set
|
|
||||||
# CONFIG_AUFS_BRANCH_MAX_1023 is not set
|
|
||||||
# CONFIG_AUFS_BRANCH_MAX_32767 is not set
|
|
||||||
## end choice
|
|
||||||
# CONFIG_AUFS_HNOTIFY is not set
|
|
||||||
CONFIG_AUFS_EXPORT=y
|
|
||||||
# CONFIG_AUFS_FHSM is not set
|
|
||||||
# CONFIG_AUFS_RDU is not set
|
|
||||||
# CONFIG_AUFS_SHWH is not set
|
|
||||||
# CONFIG_AUFS_BR_RAMFS is not set
|
|
||||||
# CONFIG_AUFS_BR_FUSE is not set
|
|
||||||
CONFIG_AUFS_BR_HFSPLUS=y
|
|
||||||
# CONFIG_AUFS_DEBUG is not set
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: fs/autofs4/Kconfig
|
## file: fs/autofs4/Kconfig
|
||||||
##
|
##
|
||||||
|
@ -4838,6 +4818,11 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y
|
||||||
##
|
##
|
||||||
CONFIG_OMFS_FS=m
|
CONFIG_OMFS_FS=m
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: fs/overlayfs/Kconfig
|
||||||
|
##
|
||||||
|
CONFIG_OVERLAY_FS=m
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: fs/proc/Kconfig
|
## file: fs/proc/Kconfig
|
||||||
##
|
##
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
From: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
Subject: aufs: mark as staging
|
|
||||||
Forwarded: not-needed
|
|
||||||
|
|
||||||
This hasn't been reviewed upstream, so should have the same status
|
|
||||||
as code in drivers/staging.
|
|
||||||
|
|
||||||
Also note in the MAINTAINERS file that it's not upstream.
|
|
||||||
|
|
||||||
--- a/fs/aufs/module.c
|
|
||||||
+++ b/fs/aufs/module.c
|
|
||||||
@@ -103,6 +103,7 @@ MODULE_DESCRIPTION(AUFS_NAME
|
|
||||||
" -- Advanced multi layered unification filesystem");
|
|
||||||
MODULE_VERSION(AUFS_VERSION);
|
|
||||||
MODULE_ALIAS_FS(AUFS_NAME);
|
|
||||||
+MODULE_INFO(staging, "Y");
|
|
||||||
|
|
||||||
/* this module parameter has no meaning when SYSFS is disabled */
|
|
||||||
int sysaufs_brs = 1;
|
|
||||||
--- a/MAINTAINERS
|
|
||||||
+++ b/MAINTAINERS
|
|
||||||
@@ -1705,7 +1705,7 @@ L: aufs-users@lists.sourceforge.net (mem
|
|
||||||
W: http://aufs.sourceforge.net
|
|
||||||
T: git://git.code.sf.net/p/aufs/aufs3-linux
|
|
||||||
T: git://github.com/sfjro/aufs3-linux.git
|
|
||||||
-S: Supported
|
|
||||||
+S: Supported, not upstream
|
|
||||||
F: Documentation/filesystems/aufs/
|
|
||||||
F: Documentation/ABI/testing/debugfs-aufs
|
|
||||||
F: Documentation/ABI/testing/sysfs-aufs
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,132 +0,0 @@
|
||||||
From: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
||||||
Date: Sun Oct 12 08:52:06 2014 +0900
|
|
||||||
Subject: aufs3.17 base patch
|
|
||||||
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/3316237b92dd0660799fdc253a925d5065ec9c6b/tree/
|
|
||||||
Bug-Debian: https://bugs.debian.org/541828
|
|
||||||
|
|
||||||
Patch headers added by debian/patches/features/all/aufs3/gen-patch
|
|
||||||
|
|
||||||
aufs3.17 base patch
|
|
||||||
|
|
||||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
||||||
index f10ed39..22b72ce 100644
|
|
||||||
--- a/MAINTAINERS
|
|
||||||
+++ b/MAINTAINERS
|
|
||||||
@@ -1747,6 +1747,20 @@ F: include/linux/audit.h
|
|
||||||
F: include/uapi/linux/audit.h
|
|
||||||
F: kernel/audit*
|
|
||||||
|
|
||||||
+AUFS (advanced multi layered unification filesystem) FILESYSTEM
|
|
||||||
+M: "J. R. Okajima" <hooanon05g@gmail.com>
|
|
||||||
+L: linux-unionfs@vger.kernel.org
|
|
||||||
+L: aufs-users@lists.sourceforge.net (members only)
|
|
||||||
+W: http://aufs.sourceforge.net
|
|
||||||
+T: git://git.code.sf.net/p/aufs/aufs3-linux
|
|
||||||
+T: git://github.com/sfjro/aufs3-linux.git
|
|
||||||
+S: Supported
|
|
||||||
+F: Documentation/filesystems/aufs/
|
|
||||||
+F: Documentation/ABI/testing/debugfs-aufs
|
|
||||||
+F: Documentation/ABI/testing/sysfs-aufs
|
|
||||||
+F: fs/aufs/
|
|
||||||
+F: include/uapi/linux/aufs_type.h
|
|
||||||
+
|
|
||||||
AUXILIARY DISPLAY DRIVERS
|
|
||||||
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
|
|
||||||
W: http://miguelojeda.es/auxdisplay.htm
|
|
||||||
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
|
|
||||||
index 6cb1beb..30efd68 100644
|
|
||||||
--- a/drivers/block/loop.c
|
|
||||||
+++ b/drivers/block/loop.c
|
|
||||||
@@ -692,6 +692,24 @@ static inline int is_loop_device(struct file *file)
|
|
||||||
return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * for AUFS
|
|
||||||
+ * no get/put for file.
|
|
||||||
+ */
|
|
||||||
+struct file *loop_backing_file(struct super_block *sb)
|
|
||||||
+{
|
|
||||||
+ struct file *ret;
|
|
||||||
+ struct loop_device *l;
|
|
||||||
+
|
|
||||||
+ ret = NULL;
|
|
||||||
+ if (MAJOR(sb->s_dev) == LOOP_MAJOR) {
|
|
||||||
+ l = sb->s_bdev->bd_disk->private_data;
|
|
||||||
+ ret = l->lo_backing_file;
|
|
||||||
+ }
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL_GPL(loop_backing_file);
|
|
||||||
+
|
|
||||||
/* loop sysfs attributes */
|
|
||||||
|
|
||||||
static ssize_t loop_attr_show(struct device *dev, char *page,
|
|
||||||
diff --git a/fs/inode.c b/fs/inode.c
|
|
||||||
index 26753ba..df21e66 100644
|
|
||||||
--- a/fs/inode.c
|
|
||||||
+++ b/fs/inode.c
|
|
||||||
@@ -1497,7 +1497,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
|
|
||||||
* This does the actual work of updating an inodes time or version. Must have
|
|
||||||
* had called mnt_want_write() before calling this.
|
|
||||||
*/
|
|
||||||
-static int update_time(struct inode *inode, struct timespec *time, int flags)
|
|
||||||
+int update_time(struct inode *inode, struct timespec *time, int flags)
|
|
||||||
{
|
|
||||||
if (inode->i_op->update_time)
|
|
||||||
return inode->i_op->update_time(inode, time, flags);
|
|
||||||
diff --git a/fs/splice.c b/fs/splice.c
|
|
||||||
index f5cb9ba..9ba380c 100644
|
|
||||||
--- a/fs/splice.c
|
|
||||||
+++ b/fs/splice.c
|
|
||||||
@@ -1114,8 +1114,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
|
|
||||||
/*
|
|
||||||
* Attempt to initiate a splice from pipe to file.
|
|
||||||
*/
|
|
||||||
-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
||||||
- loff_t *ppos, size_t len, unsigned int flags)
|
|
||||||
+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
||||||
+ loff_t *ppos, size_t len, unsigned int flags)
|
|
||||||
{
|
|
||||||
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
|
|
||||||
loff_t *, size_t, unsigned int);
|
|
||||||
@@ -1131,9 +1131,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
||||||
/*
|
|
||||||
* Attempt to initiate a splice from a file to a pipe.
|
|
||||||
*/
|
|
||||||
-static long do_splice_to(struct file *in, loff_t *ppos,
|
|
||||||
- struct pipe_inode_info *pipe, size_t len,
|
|
||||||
- unsigned int flags)
|
|
||||||
+long do_splice_to(struct file *in, loff_t *ppos,
|
|
||||||
+ struct pipe_inode_info *pipe, size_t len,
|
|
||||||
+ unsigned int flags)
|
|
||||||
{
|
|
||||||
ssize_t (*splice_read)(struct file *, loff_t *,
|
|
||||||
struct pipe_inode_info *, size_t, unsigned int);
|
|
||||||
diff --git a/include/linux/fs.h b/include/linux/fs.h
|
|
||||||
index 9418772..c28347c 100644
|
|
||||||
--- a/include/linux/fs.h
|
|
||||||
+++ b/include/linux/fs.h
|
|
||||||
@@ -2645,6 +2645,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
|
|
||||||
extern int inode_newsize_ok(const struct inode *, loff_t offset);
|
|
||||||
extern void setattr_copy(struct inode *inode, const struct iattr *attr);
|
|
||||||
|
|
||||||
+extern int update_time(struct inode *, struct timespec *, int);
|
|
||||||
extern int file_update_time(struct file *file);
|
|
||||||
|
|
||||||
extern int generic_show_options(struct seq_file *m, struct dentry *root);
|
|
||||||
diff --git a/include/linux/splice.h b/include/linux/splice.h
|
|
||||||
index da2751d..2e0fca6 100644
|
|
||||||
--- a/include/linux/splice.h
|
|
||||||
+++ b/include/linux/splice.h
|
|
||||||
@@ -83,4 +83,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
|
|
||||||
extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
|
|
||||||
|
|
||||||
extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
|
|
||||||
+
|
|
||||||
+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
||||||
+ loff_t *ppos, size_t len, unsigned int flags);
|
|
||||||
+extern long do_splice_to(struct file *in, loff_t *ppos,
|
|
||||||
+ struct pipe_inode_info *pipe, size_t len,
|
|
||||||
+ unsigned int flags);
|
|
||||||
#endif
|
|
|
@ -1,43 +0,0 @@
|
||||||
From: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
||||||
Date: Sun Oct 12 08:52:06 2014 +0900
|
|
||||||
Subject: aufs3.17 kbuild patch
|
|
||||||
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/3316237b92dd0660799fdc253a925d5065ec9c6b/tree/
|
|
||||||
Bug-Debian: https://bugs.debian.org/541828
|
|
||||||
|
|
||||||
Patch headers added by debian/patches/features/all/aufs3/gen-patch
|
|
||||||
|
|
||||||
aufs3.17 kbuild patch
|
|
||||||
|
|
||||||
diff --git a/fs/Kconfig b/fs/Kconfig
|
|
||||||
index 312393f..78632ed 100644
|
|
||||||
--- a/fs/Kconfig
|
|
||||||
+++ b/fs/Kconfig
|
|
||||||
@@ -209,6 +209,7 @@ source "fs/ufs/Kconfig"
|
|
||||||
source "fs/exofs/Kconfig"
|
|
||||||
source "fs/f2fs/Kconfig"
|
|
||||||
source "fs/efivarfs/Kconfig"
|
|
||||||
+source "fs/aufs/Kconfig"
|
|
||||||
|
|
||||||
endif # MISC_FILESYSTEMS
|
|
||||||
|
|
||||||
diff --git a/fs/Makefile b/fs/Makefile
|
|
||||||
index 90c8852..d4f52f3 100644
|
|
||||||
--- a/fs/Makefile
|
|
||||||
+++ b/fs/Makefile
|
|
||||||
@@ -125,3 +125,4 @@ obj-y += exofs/ # Multiple modules
|
|
||||||
obj-$(CONFIG_CEPH_FS) += ceph/
|
|
||||||
obj-$(CONFIG_PSTORE) += pstore/
|
|
||||||
obj-$(CONFIG_EFIVAR_FS) += efivarfs/
|
|
||||||
+obj-$(CONFIG_AUFS_FS) += aufs/
|
|
||||||
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
|
|
||||||
index be88166..c236c53 100644
|
|
||||||
--- a/include/uapi/linux/Kbuild
|
|
||||||
+++ b/include/uapi/linux/Kbuild
|
|
||||||
@@ -56,6 +56,7 @@ header-y += atmppp.h
|
|
||||||
header-y += atmsap.h
|
|
||||||
header-y += atmsvc.h
|
|
||||||
header-y += audit.h
|
|
||||||
+header-y += aufs_type.h
|
|
||||||
header-y += auto_fs.h
|
|
||||||
header-y += auto_fs4.h
|
|
||||||
header-y += auxvec.h
|
|
|
@ -1,467 +0,0 @@
|
||||||
From: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
||||||
Date: Sun Oct 12 08:52:06 2014 +0900
|
|
||||||
Subject: aufs3.17 mmap patch
|
|
||||||
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/3316237b92dd0660799fdc253a925d5065ec9c6b/tree/
|
|
||||||
Bug-Debian: https://bugs.debian.org/541828
|
|
||||||
|
|
||||||
Patch headers added by debian/patches/features/all/aufs3/gen-patch
|
|
||||||
|
|
||||||
aufs3.17 mmap patch
|
|
||||||
|
|
||||||
diff --git a/fs/buffer.c b/fs/buffer.c
|
|
||||||
index 3588a80..e185f4f 100644
|
|
||||||
--- a/fs/buffer.c
|
|
||||||
+++ b/fs/buffer.c
|
|
||||||
@@ -2455,7 +2455,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
|
|
||||||
* Update file times before taking page lock. We may end up failing the
|
|
||||||
* fault so this update may be superfluous but who really cares...
|
|
||||||
*/
|
|
||||||
- file_update_time(vma->vm_file);
|
|
||||||
+ vma_file_update_time(vma);
|
|
||||||
|
|
||||||
ret = __block_page_mkwrite(vma, vmf, get_block);
|
|
||||||
sb_end_pagefault(sb);
|
|
||||||
diff --git a/fs/proc/base.c b/fs/proc/base.c
|
|
||||||
index baf852b..6389b5e 100644
|
|
||||||
--- a/fs/proc/base.c
|
|
||||||
+++ b/fs/proc/base.c
|
|
||||||
@@ -1764,7 +1764,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path)
|
|
||||||
down_read(&mm->mmap_sem);
|
|
||||||
vma = find_exact_vma(mm, vm_start, vm_end);
|
|
||||||
if (vma && vma->vm_file) {
|
|
||||||
- *path = vma->vm_file->f_path;
|
|
||||||
+ *path = vma_pr_or_file(vma)->f_path;
|
|
||||||
path_get(path);
|
|
||||||
rc = 0;
|
|
||||||
}
|
|
||||||
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
|
|
||||||
index d4a3574..1397181 100644
|
|
||||||
--- a/fs/proc/nommu.c
|
|
||||||
+++ b/fs/proc/nommu.c
|
|
||||||
@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
|
|
||||||
file = region->vm_file;
|
|
||||||
|
|
||||||
if (file) {
|
|
||||||
- struct inode *inode = file_inode(region->vm_file);
|
|
||||||
+ struct inode *inode;
|
|
||||||
+
|
|
||||||
+ file = vmr_pr_or_file(region);
|
|
||||||
+ inode = file_inode(file);
|
|
||||||
dev = inode->i_sb->s_dev;
|
|
||||||
ino = inode->i_ino;
|
|
||||||
}
|
|
||||||
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
|
|
||||||
index c341568..8564639 100644
|
|
||||||
--- a/fs/proc/task_mmu.c
|
|
||||||
+++ b/fs/proc/task_mmu.c
|
|
||||||
@@ -265,7 +265,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
|
|
||||||
const char *name = NULL;
|
|
||||||
|
|
||||||
if (file) {
|
|
||||||
- struct inode *inode = file_inode(vma->vm_file);
|
|
||||||
+ struct inode *inode;
|
|
||||||
+
|
|
||||||
+ file = vma_pr_or_file(vma);
|
|
||||||
+ inode = file_inode(file);
|
|
||||||
dev = inode->i_sb->s_dev;
|
|
||||||
ino = inode->i_ino;
|
|
||||||
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
|
|
||||||
@@ -1414,7 +1417,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
|
|
||||||
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
|
|
||||||
struct vm_area_struct *vma = v;
|
|
||||||
struct numa_maps *md = &numa_priv->md;
|
|
||||||
- struct file *file = vma->vm_file;
|
|
||||||
+ struct file *file = vma_pr_or_file(vma);
|
|
||||||
struct task_struct *task = proc_priv->task;
|
|
||||||
struct mm_struct *mm = vma->vm_mm;
|
|
||||||
struct mm_walk walk = {};
|
|
||||||
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
|
|
||||||
index 678455d..0ef7ef4 100644
|
|
||||||
--- a/fs/proc/task_nommu.c
|
|
||||||
+++ b/fs/proc/task_nommu.c
|
|
||||||
@@ -141,7 +141,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
|
|
||||||
file = vma->vm_file;
|
|
||||||
|
|
||||||
if (file) {
|
|
||||||
- struct inode *inode = file_inode(vma->vm_file);
|
|
||||||
+ struct inode *inode;
|
|
||||||
+
|
|
||||||
+ file = vma_pr_or_file(file);
|
|
||||||
+ inode = file_inode(file);
|
|
||||||
dev = inode->i_sb->s_dev;
|
|
||||||
ino = inode->i_ino;
|
|
||||||
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
|
|
||||||
diff --git a/include/linux/mm.h b/include/linux/mm.h
|
|
||||||
index 8981cc8..9460928 100644
|
|
||||||
--- a/include/linux/mm.h
|
|
||||||
+++ b/include/linux/mm.h
|
|
||||||
@@ -1184,6 +1184,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef CONFIG_MMU
|
|
||||||
+extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
|
|
||||||
+extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
|
|
||||||
+ int);
|
|
||||||
+extern void vma_do_get_file(struct vm_area_struct *, const char[], int);
|
|
||||||
+extern void vma_do_fput(struct vm_area_struct *, const char[], int);
|
|
||||||
+
|
|
||||||
+#define vma_file_update_time(vma) vma_do_file_update_time(vma, __func__, \
|
|
||||||
+ __LINE__)
|
|
||||||
+#define vma_pr_or_file(vma) vma_do_pr_or_file(vma, __func__, \
|
|
||||||
+ __LINE__)
|
|
||||||
+#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__)
|
|
||||||
+#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__)
|
|
||||||
+#else
|
|
||||||
+extern struct file *vmr_do_pr_or_file(struct vm_region *, const char[], int);
|
|
||||||
+extern void vmr_do_fput(struct vm_region *, const char[], int);
|
|
||||||
+
|
|
||||||
+#define vmr_pr_or_file(region) vmr_do_pr_or_file(region, __func__, \
|
|
||||||
+ __LINE__)
|
|
||||||
+#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__)
|
|
||||||
+#endif /* CONFIG_MMU */
|
|
||||||
+
|
|
||||||
extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
|
|
||||||
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
|
|
||||||
void *buf, int len, int write);
|
|
||||||
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
|
|
||||||
index 6e0b286..8f374ed 100644
|
|
||||||
--- a/include/linux/mm_types.h
|
|
||||||
+++ b/include/linux/mm_types.h
|
|
||||||
@@ -232,6 +232,7 @@ struct vm_region {
|
|
||||||
unsigned long vm_top; /* region allocated to here */
|
|
||||||
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
|
|
||||||
struct file *vm_file; /* the backing file or NULL */
|
|
||||||
+ struct file *vm_prfile; /* the virtual backing file or NULL */
|
|
||||||
|
|
||||||
int vm_usage; /* region usage count (access under nommu_region_sem) */
|
|
||||||
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
|
|
||||||
@@ -300,6 +301,7 @@ struct vm_area_struct {
|
|
||||||
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
|
|
||||||
units, *not* PAGE_CACHE_SIZE */
|
|
||||||
struct file * vm_file; /* File we map to (can be NULL). */
|
|
||||||
+ struct file *vm_prfile; /* shadow of vm_file */
|
|
||||||
void * vm_private_data; /* was vm_pte (shared mem) */
|
|
||||||
|
|
||||||
#ifndef CONFIG_MMU
|
|
||||||
diff --git a/kernel/fork.c b/kernel/fork.c
|
|
||||||
index a91e47d..2e9d836c 100644
|
|
||||||
--- a/kernel/fork.c
|
|
||||||
+++ b/kernel/fork.c
|
|
||||||
@@ -424,7 +424,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
|
|
||||||
struct inode *inode = file_inode(file);
|
|
||||||
struct address_space *mapping = file->f_mapping;
|
|
||||||
|
|
||||||
- get_file(file);
|
|
||||||
+ vma_get_file(tmp);
|
|
||||||
if (tmp->vm_flags & VM_DENYWRITE)
|
|
||||||
atomic_dec(&inode->i_writecount);
|
|
||||||
mutex_lock(&mapping->i_mmap_mutex);
|
|
||||||
diff --git a/mm/Makefile b/mm/Makefile
|
|
||||||
index 632ae77..d3bdeb6 100644
|
|
||||||
--- a/mm/Makefile
|
|
||||||
+++ b/mm/Makefile
|
|
||||||
@@ -18,7 +18,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
|
|
||||||
mm_init.o mmu_context.o percpu.o slab_common.o \
|
|
||||||
compaction.o balloon_compaction.o vmacache.o \
|
|
||||||
interval_tree.o list_lru.o workingset.o \
|
|
||||||
- iov_iter.o $(mmu-y)
|
|
||||||
+ iov_iter.o prfile.o $(mmu-y)
|
|
||||||
|
|
||||||
obj-y += init-mm.o
|
|
||||||
|
|
||||||
diff --git a/mm/filemap.c b/mm/filemap.c
|
|
||||||
index 90effcd..0021dc8 100644
|
|
||||||
--- a/mm/filemap.c
|
|
||||||
+++ b/mm/filemap.c
|
|
||||||
@@ -2058,7 +2058,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
|
|
||||||
int ret = VM_FAULT_LOCKED;
|
|
||||||
|
|
||||||
sb_start_pagefault(inode->i_sb);
|
|
||||||
- file_update_time(vma->vm_file);
|
|
||||||
+ vma_file_update_time(vma);
|
|
||||||
lock_page(page);
|
|
||||||
if (page->mapping != inode->i_mapping) {
|
|
||||||
unlock_page(page);
|
|
||||||
diff --git a/mm/fremap.c b/mm/fremap.c
|
|
||||||
index 72b8fa3..a00bbf0 100644
|
|
||||||
--- a/mm/fremap.c
|
|
||||||
+++ b/mm/fremap.c
|
|
||||||
@@ -224,16 +224,28 @@ get_write_lock:
|
|
||||||
*/
|
|
||||||
if (mapping_cap_account_dirty(mapping)) {
|
|
||||||
unsigned long addr;
|
|
||||||
- struct file *file = get_file(vma->vm_file);
|
|
||||||
+ struct file *file = vma->vm_file,
|
|
||||||
+ *prfile = vma->vm_prfile;
|
|
||||||
+
|
|
||||||
/* mmap_region may free vma; grab the info now */
|
|
||||||
vm_flags = vma->vm_flags;
|
|
||||||
|
|
||||||
+ vma_get_file(vma);
|
|
||||||
addr = mmap_region(file, start, size, vm_flags, pgoff);
|
|
||||||
- fput(file);
|
|
||||||
+ vma_fput(vma);
|
|
||||||
if (IS_ERR_VALUE(addr)) {
|
|
||||||
err = addr;
|
|
||||||
} else {
|
|
||||||
BUG_ON(addr != start);
|
|
||||||
+ if (prfile) {
|
|
||||||
+ struct vm_area_struct *new_vma;
|
|
||||||
+
|
|
||||||
+ new_vma = find_vma(mm, addr);
|
|
||||||
+ if (!new_vma->vm_prfile)
|
|
||||||
+ new_vma->vm_prfile = prfile;
|
|
||||||
+ if (new_vma != vma)
|
|
||||||
+ get_file(prfile);
|
|
||||||
+ }
|
|
||||||
err = 0;
|
|
||||||
}
|
|
||||||
goto out_freed;
|
|
||||||
diff --git a/mm/madvise.c b/mm/madvise.c
|
|
||||||
index 0938b30..0b66856 100644
|
|
||||||
--- a/mm/madvise.c
|
|
||||||
+++ b/mm/madvise.c
|
|
||||||
@@ -324,12 +324,12 @@ static long madvise_remove(struct vm_area_struct *vma,
|
|
||||||
* vma's reference to the file) can go away as soon as we drop
|
|
||||||
* mmap_sem.
|
|
||||||
*/
|
|
||||||
- get_file(f);
|
|
||||||
+ vma_get_file(vma);
|
|
||||||
up_read(¤t->mm->mmap_sem);
|
|
||||||
error = do_fallocate(f,
|
|
||||||
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
|
|
||||||
offset, end - start);
|
|
||||||
- fput(f);
|
|
||||||
+ vma_fput(vma);
|
|
||||||
down_read(¤t->mm->mmap_sem);
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
diff --git a/mm/memory.c b/mm/memory.c
|
|
||||||
index e229970..5f5e345 100644
|
|
||||||
--- a/mm/memory.c
|
|
||||||
+++ b/mm/memory.c
|
|
||||||
@@ -2161,7 +2161,7 @@ reuse:
|
|
||||||
set_page_dirty_balance(dirty_page);
|
|
||||||
/* file_update_time outside page_lock */
|
|
||||||
if (vma->vm_file)
|
|
||||||
- file_update_time(vma->vm_file);
|
|
||||||
+ vma_file_update_time(vma);
|
|
||||||
}
|
|
||||||
put_page(dirty_page);
|
|
||||||
if (page_mkwrite) {
|
|
||||||
diff --git a/mm/mmap.c b/mm/mmap.c
|
|
||||||
index c0a3637..60df815 100644
|
|
||||||
--- a/mm/mmap.c
|
|
||||||
+++ b/mm/mmap.c
|
|
||||||
@@ -258,7 +258,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
|
|
||||||
if (vma->vm_ops && vma->vm_ops->close)
|
|
||||||
vma->vm_ops->close(vma);
|
|
||||||
if (vma->vm_file)
|
|
||||||
- fput(vma->vm_file);
|
|
||||||
+ vma_fput(vma);
|
|
||||||
mpol_put(vma_policy(vma));
|
|
||||||
kmem_cache_free(vm_area_cachep, vma);
|
|
||||||
return next;
|
|
||||||
@@ -868,7 +868,7 @@ again: remove_next = 1 + (end > next->vm_end);
|
|
||||||
if (remove_next) {
|
|
||||||
if (file) {
|
|
||||||
uprobe_munmap(next, next->vm_start, next->vm_end);
|
|
||||||
- fput(file);
|
|
||||||
+ vma_fput(vma);
|
|
||||||
}
|
|
||||||
if (next->anon_vma)
|
|
||||||
anon_vma_merge(vma, next);
|
|
||||||
@@ -1661,8 +1661,8 @@ out:
|
|
||||||
return addr;
|
|
||||||
|
|
||||||
unmap_and_free_vma:
|
|
||||||
+ vma_fput(vma);
|
|
||||||
vma->vm_file = NULL;
|
|
||||||
- fput(file);
|
|
||||||
|
|
||||||
/* Undo any partial mapping done by a device driver. */
|
|
||||||
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
|
|
||||||
@@ -2457,7 +2457,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
|
|
||||||
goto out_free_mpol;
|
|
||||||
|
|
||||||
if (new->vm_file)
|
|
||||||
- get_file(new->vm_file);
|
|
||||||
+ vma_get_file(new);
|
|
||||||
|
|
||||||
if (new->vm_ops && new->vm_ops->open)
|
|
||||||
new->vm_ops->open(new);
|
|
||||||
@@ -2476,7 +2476,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
|
|
||||||
if (new->vm_ops && new->vm_ops->close)
|
|
||||||
new->vm_ops->close(new);
|
|
||||||
if (new->vm_file)
|
|
||||||
- fput(new->vm_file);
|
|
||||||
+ vma_fput(new);
|
|
||||||
unlink_anon_vmas(new);
|
|
||||||
out_free_mpol:
|
|
||||||
mpol_put(vma_policy(new));
|
|
||||||
@@ -2865,7 +2865,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
|
|
||||||
if (anon_vma_clone(new_vma, vma))
|
|
||||||
goto out_free_mempol;
|
|
||||||
if (new_vma->vm_file)
|
|
||||||
- get_file(new_vma->vm_file);
|
|
||||||
+ vma_get_file(new_vma);
|
|
||||||
if (new_vma->vm_ops && new_vma->vm_ops->open)
|
|
||||||
new_vma->vm_ops->open(new_vma);
|
|
||||||
vma_link(mm, new_vma, prev, rb_link, rb_parent);
|
|
||||||
diff --git a/mm/msync.c b/mm/msync.c
|
|
||||||
index 992a167..ce1915b 100644
|
|
||||||
--- a/mm/msync.c
|
|
||||||
+++ b/mm/msync.c
|
|
||||||
@@ -84,13 +84,13 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
|
|
||||||
start = vma->vm_end;
|
|
||||||
if ((flags & MS_SYNC) && file &&
|
|
||||||
(vma->vm_flags & VM_SHARED)) {
|
|
||||||
- get_file(file);
|
|
||||||
+ vma_get_file(vma);
|
|
||||||
up_read(&mm->mmap_sem);
|
|
||||||
if (vma->vm_flags & VM_NONLINEAR)
|
|
||||||
error = vfs_fsync(file, 1);
|
|
||||||
else
|
|
||||||
error = vfs_fsync_range(file, fstart, fend, 1);
|
|
||||||
- fput(file);
|
|
||||||
+ vma_fput(vma);
|
|
||||||
if (error || start >= end)
|
|
||||||
goto out;
|
|
||||||
down_read(&mm->mmap_sem);
|
|
||||||
diff --git a/mm/nommu.c b/mm/nommu.c
|
|
||||||
index a881d96..5a402f4 100644
|
|
||||||
--- a/mm/nommu.c
|
|
||||||
+++ b/mm/nommu.c
|
|
||||||
@@ -658,7 +658,7 @@ static void __put_nommu_region(struct vm_region *region)
|
|
||||||
up_write(&nommu_region_sem);
|
|
||||||
|
|
||||||
if (region->vm_file)
|
|
||||||
- fput(region->vm_file);
|
|
||||||
+ vmr_fput(region);
|
|
||||||
|
|
||||||
/* IO memory and memory shared directly out of the pagecache
|
|
||||||
* from ramfs/tmpfs mustn't be released here */
|
|
||||||
@@ -823,7 +823,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
|
|
||||||
if (vma->vm_ops && vma->vm_ops->close)
|
|
||||||
vma->vm_ops->close(vma);
|
|
||||||
if (vma->vm_file)
|
|
||||||
- fput(vma->vm_file);
|
|
||||||
+ vma_fput(vma);
|
|
||||||
put_nommu_region(vma->vm_region);
|
|
||||||
kmem_cache_free(vm_area_cachep, vma);
|
|
||||||
}
|
|
||||||
@@ -1385,7 +1385,7 @@ unsigned long do_mmap_pgoff(struct file *file,
|
|
||||||
goto error_just_free;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- fput(region->vm_file);
|
|
||||||
+ vmr_fput(region);
|
|
||||||
kmem_cache_free(vm_region_jar, region);
|
|
||||||
region = pregion;
|
|
||||||
result = start;
|
|
||||||
@@ -1461,10 +1461,10 @@ error_just_free:
|
|
||||||
up_write(&nommu_region_sem);
|
|
||||||
error:
|
|
||||||
if (region->vm_file)
|
|
||||||
- fput(region->vm_file);
|
|
||||||
+ vmr_fput(region);
|
|
||||||
kmem_cache_free(vm_region_jar, region);
|
|
||||||
if (vma->vm_file)
|
|
||||||
- fput(vma->vm_file);
|
|
||||||
+ vma_fput(vma);
|
|
||||||
kmem_cache_free(vm_area_cachep, vma);
|
|
||||||
kleave(" = %d", ret);
|
|
||||||
return ret;
|
|
||||||
diff --git a/mm/prfile.c b/mm/prfile.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..fc708d2
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/mm/prfile.c
|
|
||||||
@@ -0,0 +1,86 @@
|
|
||||||
+/*
|
|
||||||
+ * Mainly for aufs which mmap(2) diffrent file and wants to print different path
|
|
||||||
+ * in /proc/PID/maps.
|
|
||||||
+ * Call these functions via macros defined in linux/mm.h.
|
|
||||||
+ *
|
|
||||||
+ * See Documentation/filesystems/aufs/design/06mmap.txt
|
|
||||||
+ *
|
|
||||||
+ * Copyright (c) 2014 Junjro R. Okajima
|
|
||||||
+ * Copyright (c) 2014 Ian Campbell
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <linux/mm.h>
|
|
||||||
+#include <linux/file.h>
|
|
||||||
+#include <linux/fs.h>
|
|
||||||
+
|
|
||||||
+/* #define PRFILE_TRACE */
|
|
||||||
+static inline void prfile_trace(struct file *f, struct file *pr,
|
|
||||||
+ const char func[], int line, const char func2[])
|
|
||||||
+{
|
|
||||||
+#ifdef PRFILE_TRACE
|
|
||||||
+ if (pr)
|
|
||||||
+ pr_info("%s:%d: %s, %p\n", func, line, func2,
|
|
||||||
+ f ? (char *)f->f_dentry->d_name.name : "(null)");
|
|
||||||
+#endif
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_MMU
|
|
||||||
+void vma_do_file_update_time(struct vm_area_struct *vma, const char func[],
|
|
||||||
+ int line)
|
|
||||||
+{
|
|
||||||
+ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
|
|
||||||
+
|
|
||||||
+ prfile_trace(f, pr, func, line, __func__);
|
|
||||||
+ file_update_time(f);
|
|
||||||
+ if (f && pr)
|
|
||||||
+ file_update_time(pr);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+struct file *vma_do_pr_or_file(struct vm_area_struct *vma, const char func[],
|
|
||||||
+ int line)
|
|
||||||
+{
|
|
||||||
+ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
|
|
||||||
+
|
|
||||||
+ prfile_trace(f, pr, func, line, __func__);
|
|
||||||
+ return (f && pr) ? pr : f;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void vma_do_get_file(struct vm_area_struct *vma, const char func[], int line)
|
|
||||||
+{
|
|
||||||
+ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
|
|
||||||
+
|
|
||||||
+ prfile_trace(f, pr, func, line, __func__);
|
|
||||||
+ get_file(f);
|
|
||||||
+ if (f && pr)
|
|
||||||
+ get_file(pr);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void vma_do_fput(struct vm_area_struct *vma, const char func[], int line)
|
|
||||||
+{
|
|
||||||
+ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
|
|
||||||
+
|
|
||||||
+ prfile_trace(f, pr, func, line, __func__);
|
|
||||||
+ fput(f);
|
|
||||||
+ if (f && pr)
|
|
||||||
+ fput(pr);
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
+struct file *vmr_do_pr_or_file(struct vm_region *region, const char func[],
|
|
||||||
+ int line)
|
|
||||||
+{
|
|
||||||
+ struct file *f = region->vm_file, *pr = region->vm_prfile;
|
|
||||||
+
|
|
||||||
+ prfile_trace(f, pr, func, line, __func__);
|
|
||||||
+ return (f && pr) ? pr : f;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void vmr_do_fput(struct vm_region *region, const char func[], int line)
|
|
||||||
+{
|
|
||||||
+ struct file *f = region->vm_file, *pr = region->vm_prfile;
|
|
||||||
+
|
|
||||||
+ prfile_trace(f, pr, func, line, __func__);
|
|
||||||
+ fput(f);
|
|
||||||
+ if (f && pr)
|
|
||||||
+ fput(pr);
|
|
||||||
+}
|
|
||||||
+#endif /* CONFIG_MMU */
|
|
|
@ -1,282 +0,0 @@
|
||||||
From: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
||||||
Date: Sun Oct 12 08:52:06 2014 +0900
|
|
||||||
Subject: aufs3.17 standalone patch
|
|
||||||
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/3316237b92dd0660799fdc253a925d5065ec9c6b/tree/
|
|
||||||
Bug-Debian: https://bugs.debian.org/541828
|
|
||||||
|
|
||||||
Patch headers added by debian/patches/features/all/aufs3/gen-patch
|
|
||||||
|
|
||||||
aufs3.17 standalone patch
|
|
||||||
|
|
||||||
diff --git a/fs/inode.c b/fs/inode.c
|
|
||||||
index df21e66..c8df03d 100644
|
|
||||||
--- a/fs/inode.c
|
|
||||||
+++ b/fs/inode.c
|
|
||||||
@@ -57,6 +57,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
|
|
||||||
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
|
|
||||||
|
|
||||||
__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
|
|
||||||
+EXPORT_SYMBOL_GPL(inode_sb_list_lock);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Empty aops. Can be used for the cases where the user does not
|
|
||||||
@@ -1513,6 +1514,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
|
|
||||||
mark_inode_dirty_sync(inode);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(update_time);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* touch_atime - update the access time
|
|
||||||
diff --git a/fs/namespace.c b/fs/namespace.c
|
|
||||||
index ef42d9b..88af377 100644
|
|
||||||
--- a/fs/namespace.c
|
|
||||||
+++ b/fs/namespace.c
|
|
||||||
@@ -452,6 +452,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
|
|
||||||
mnt_dec_writers(real_mount(mnt));
|
|
||||||
preempt_enable();
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(__mnt_drop_write);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* mnt_drop_write - give up write access to a mount
|
|
||||||
@@ -1584,6 +1585,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(iterate_mounts);
|
|
||||||
|
|
||||||
static void cleanup_group_ids(struct mount *mnt, struct mount *end)
|
|
||||||
{
|
|
||||||
diff --git a/fs/notify/group.c b/fs/notify/group.c
|
|
||||||
index ad19959..adf290d 100644
|
|
||||||
--- a/fs/notify/group.c
|
|
||||||
+++ b/fs/notify/group.c
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
#include <linux/srcu.h>
|
|
||||||
#include <linux/rculist.h>
|
|
||||||
#include <linux/wait.h>
|
|
||||||
+#include <linux/module.h>
|
|
||||||
|
|
||||||
#include <linux/fsnotify_backend.h>
|
|
||||||
#include "fsnotify.h"
|
|
||||||
@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
|
|
||||||
{
|
|
||||||
atomic_inc(&group->refcnt);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(fsnotify_get_group);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Drop a reference to a group. Free it if it's through.
|
|
||||||
@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
|
|
||||||
if (atomic_dec_and_test(&group->refcnt))
|
|
||||||
fsnotify_final_destroy_group(group);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(fsnotify_put_group);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Create a new fsnotify_group and hold a reference for the group returned.
|
|
||||||
@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
|
|
||||||
|
|
||||||
return group;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
|
|
||||||
|
|
||||||
int fsnotify_fasync(int fd, struct file *file, int on)
|
|
||||||
{
|
|
||||||
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
|
|
||||||
index d90deaa..60b4239 100644
|
|
||||||
--- a/fs/notify/mark.c
|
|
||||||
+++ b/fs/notify/mark.c
|
|
||||||
@@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
|
|
||||||
mark->free_mark(mark);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(fsnotify_put_mark);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Any time a mark is getting freed we end up here.
|
|
||||||
@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
|
|
||||||
fsnotify_destroy_mark_locked(mark, group);
|
|
||||||
mutex_unlock(&group->mark_mutex);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
|
|
||||||
|
|
||||||
void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
|
|
||||||
{
|
|
||||||
@@ -275,6 +277,7 @@ err:
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(fsnotify_add_mark);
|
|
||||||
|
|
||||||
int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
|
|
||||||
struct inode *inode, struct vfsmount *mnt, int allow_dups)
|
|
||||||
@@ -336,6 +339,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
|
|
||||||
atomic_set(&mark->refcnt, 1);
|
|
||||||
mark->free_mark = free_mark;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(fsnotify_init_mark);
|
|
||||||
|
|
||||||
static int fsnotify_mark_destroy(void *ignored)
|
|
||||||
{
|
|
||||||
diff --git a/fs/open.c b/fs/open.c
|
|
||||||
index d6fd3ac..5e99d8b 100644
|
|
||||||
--- a/fs/open.c
|
|
||||||
+++ b/fs/open.c
|
|
||||||
@@ -62,6 +62,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
|
|
||||||
mutex_unlock(&dentry->d_inode->i_mutex);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(do_truncate);
|
|
||||||
|
|
||||||
long vfs_truncate(struct path *path, loff_t length)
|
|
||||||
{
|
|
||||||
@@ -298,6 +299,7 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
|
|
||||||
sb_end_write(inode->i_sb);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(do_fallocate);
|
|
||||||
|
|
||||||
SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
|
|
||||||
{
|
|
||||||
diff --git a/fs/splice.c b/fs/splice.c
|
|
||||||
index 9ba380c..3419932 100644
|
|
||||||
--- a/fs/splice.c
|
|
||||||
+++ b/fs/splice.c
|
|
||||||
@@ -1127,6 +1127,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
||||||
|
|
||||||
return splice_write(pipe, out, ppos, len, flags);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(do_splice_from);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Attempt to initiate a splice from a file to a pipe.
|
|
||||||
@@ -1153,6 +1154,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
|
|
||||||
|
|
||||||
return splice_read(in, ppos, pipe, len, flags);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(do_splice_to);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* splice_direct_to_actor - splices data directly between two non-pipes
|
|
||||||
diff --git a/security/commoncap.c b/security/commoncap.c
|
|
||||||
index bab0611..3fa2f82 100644
|
|
||||||
--- a/security/commoncap.c
|
|
||||||
+++ b/security/commoncap.c
|
|
||||||
@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr)
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(cap_mmap_addr);
|
|
||||||
|
|
||||||
int cap_mmap_file(struct file *file, unsigned long reqprot,
|
|
||||||
unsigned long prot, unsigned long flags)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(cap_mmap_file);
|
|
||||||
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
|
|
||||||
index 188c1d2..426d9af 100644
|
|
||||||
--- a/security/device_cgroup.c
|
|
||||||
+++ b/security/device_cgroup.c
|
|
||||||
@@ -7,6 +7,7 @@
|
|
||||||
#include <linux/device_cgroup.h>
|
|
||||||
#include <linux/cgroup.h>
|
|
||||||
#include <linux/ctype.h>
|
|
||||||
+#include <linux/export.h>
|
|
||||||
#include <linux/list.h>
|
|
||||||
#include <linux/uaccess.h>
|
|
||||||
#include <linux/seq_file.h>
|
|
||||||
@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask)
|
|
||||||
return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
|
|
||||||
access);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(__devcgroup_inode_permission);
|
|
||||||
|
|
||||||
int devcgroup_inode_mknod(int mode, dev_t dev)
|
|
||||||
{
|
|
||||||
diff --git a/security/security.c b/security/security.c
|
|
||||||
index e41b1a8..37cc870 100644
|
|
||||||
--- a/security/security.c
|
|
||||||
+++ b/security/security.c
|
|
||||||
@@ -407,6 +407,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
|
|
||||||
return 0;
|
|
||||||
return security_ops->path_rmdir(dir, dentry);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_path_rmdir);
|
|
||||||
|
|
||||||
int security_path_unlink(struct path *dir, struct dentry *dentry)
|
|
||||||
{
|
|
||||||
@@ -423,6 +424,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
|
|
||||||
return 0;
|
|
||||||
return security_ops->path_symlink(dir, dentry, old_name);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_path_symlink);
|
|
||||||
|
|
||||||
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
|
|
||||||
struct dentry *new_dentry)
|
|
||||||
@@ -431,6 +433,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
|
|
||||||
return 0;
|
|
||||||
return security_ops->path_link(old_dentry, new_dir, new_dentry);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_path_link);
|
|
||||||
|
|
||||||
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
|
|
||||||
struct path *new_dir, struct dentry *new_dentry,
|
|
||||||
@@ -458,6 +461,7 @@ int security_path_truncate(struct path *path)
|
|
||||||
return 0;
|
|
||||||
return security_ops->path_truncate(path);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_path_truncate);
|
|
||||||
|
|
||||||
int security_path_chmod(struct path *path, umode_t mode)
|
|
||||||
{
|
|
||||||
@@ -465,6 +469,7 @@ int security_path_chmod(struct path *path, umode_t mode)
|
|
||||||
return 0;
|
|
||||||
return security_ops->path_chmod(path, mode);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_path_chmod);
|
|
||||||
|
|
||||||
int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
|
|
||||||
{
|
|
||||||
@@ -472,6 +477,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
|
|
||||||
return 0;
|
|
||||||
return security_ops->path_chown(path, uid, gid);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_path_chown);
|
|
||||||
|
|
||||||
int security_path_chroot(struct path *path)
|
|
||||||
{
|
|
||||||
@@ -557,6 +563,7 @@ int security_inode_readlink(struct dentry *dentry)
|
|
||||||
return 0;
|
|
||||||
return security_ops->inode_readlink(dentry);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_inode_readlink);
|
|
||||||
|
|
||||||
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
|
|
||||||
{
|
|
||||||
@@ -571,6 +578,7 @@ int security_inode_permission(struct inode *inode, int mask)
|
|
||||||
return 0;
|
|
||||||
return security_ops->inode_permission(inode, mask);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_inode_permission);
|
|
||||||
|
|
||||||
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
|
|
||||||
{
|
|
||||||
@@ -693,6 +701,7 @@ int security_file_permission(struct file *file, int mask)
|
|
||||||
|
|
||||||
return fsnotify_perm(file, mask);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_file_permission);
|
|
||||||
|
|
||||||
int security_file_alloc(struct file *file)
|
|
||||||
{
|
|
||||||
@@ -753,6 +762,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
|
|
||||||
return ret;
|
|
||||||
return ima_file_mmap(file, prot);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(security_mmap_file);
|
|
||||||
|
|
||||||
int security_mmap_addr(unsigned long addr)
|
|
||||||
{
|
|
|
@ -1,52 +0,0 @@
|
||||||
#!/bin/bash -e
|
|
||||||
|
|
||||||
aufs_dir="$1"
|
|
||||||
|
|
||||||
export GIT_DIR="$aufs_dir/.git"
|
|
||||||
|
|
||||||
from_line='From: J. R. Okajima <hooanon05@yahoo.co.jp>'
|
|
||||||
if [ -d "$GIT_DIR" ]; then
|
|
||||||
origin_line="Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/$(git rev-list HEAD -1)/tree/"
|
|
||||||
else
|
|
||||||
echo >&2 "W: Cannot include a specific origin URL without an aufs git repo"
|
|
||||||
origin_line='Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/'
|
|
||||||
fi
|
|
||||||
bug_line='Bug-Debian: https://bugs.debian.org/541828'
|
|
||||||
|
|
||||||
for patch in aufs3-{base,kbuild,mmap,standalone}.patch; do
|
|
||||||
{
|
|
||||||
echo "$from_line"
|
|
||||||
if [ -d "$GIT_DIR" ]; then
|
|
||||||
git log --pretty='Date: %ad' HEAD -1 -- "$patch"
|
|
||||||
fi
|
|
||||||
echo -n 'Subject: '
|
|
||||||
head -1 "$aufs_dir/$patch"
|
|
||||||
echo "$origin_line"
|
|
||||||
echo "$bug_line"
|
|
||||||
echo
|
|
||||||
echo 'Patch headers added by debian/patches/features/all/aufs3/gen-patch'
|
|
||||||
echo
|
|
||||||
sed 's/^+.*EXPORT_SYMBOL\b/&_GPL/' < "$aufs_dir"/"$patch"
|
|
||||||
} > debian/patches/features/all/aufs3/"$patch"
|
|
||||||
done
|
|
||||||
|
|
||||||
{
|
|
||||||
echo "$from_line"
|
|
||||||
if [ -d "$GIT_DIR" ]; then
|
|
||||||
git log --pretty='Date: %ad' HEAD -1
|
|
||||||
fi
|
|
||||||
sed -rn 's/^#define AUFS_VERSION[[:space:]]+"(.*)"/Subject: aufs\1/p' \
|
|
||||||
< "$aufs_dir/include/uapi/linux/aufs_type.h"
|
|
||||||
echo "$origin_line"
|
|
||||||
echo "$bug_line"
|
|
||||||
echo
|
|
||||||
echo 'Patch generated by debian/patches/features/all/aufs3/gen-patch'
|
|
||||||
echo
|
|
||||||
cd "$aufs_dir" && \
|
|
||||||
{ find Documentation fs -type f; \
|
|
||||||
echo include/uapi/linux/aufs_type.h; } | \
|
|
||||||
LC_ALL=C sort | \
|
|
||||||
while read file; do
|
|
||||||
diff -uN a/"$file" "$file" | filterdiff --addnewprefix=b/
|
|
||||||
done
|
|
||||||
} > debian/patches/features/all/aufs3/aufs3-add.patch
|
|
|
@ -16,16 +16,6 @@ bugfix/all/firmware_class-log-every-success-and-failure.patch
|
||||||
bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
|
bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
|
||||||
bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
|
bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
|
||||||
|
|
||||||
# Patches and source files from aufs3 repository, imported with
|
|
||||||
# debian/patches/features/all/aufs3/gen-patch.
|
|
||||||
#features/all/aufs3/aufs3-kbuild.patch
|
|
||||||
#features/all/aufs3/aufs3-base.patch
|
|
||||||
#features/all/aufs3/aufs3-mmap.patch
|
|
||||||
#features/all/aufs3/aufs3-standalone.patch
|
|
||||||
#features/all/aufs3/aufs3-add.patch
|
|
||||||
# Debian-specific changes
|
|
||||||
#debian/aufs3-mark-as-staging.patch
|
|
||||||
|
|
||||||
# Change some defaults for security reasons
|
# Change some defaults for security reasons
|
||||||
debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
|
debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
|
||||||
debian/rds-Disable-auto-loading-as-mitigation-against-local.patch
|
debian/rds-Disable-auto-loading-as-mitigation-against-local.patch
|
||||||
|
|
Loading…
Reference in New Issue