133 lines
4.7 KiB
Diff
133 lines
4.7 KiB
Diff
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
|