2015-06-16 22:42:42 +00:00
|
|
|
From: J. R. Okajima <hooanon05@yahoo.co.jp>
|
2016-02-15 16:36:21 +00:00
|
|
|
Date: Wed Feb 10 03:44:15 2016 +0900
|
2015-12-10 18:25:40 +00:00
|
|
|
Subject: aufs4.x-rcN base patch
|
2016-02-15 16:36:21 +00:00
|
|
|
Origin: https://github.com/sfjro/aufs4-standalone/tree/5fecf5788b797f74b83e36ca921dc1c4bfdcbad9
|
2015-06-16 22:42:42 +00:00
|
|
|
Bug-Debian: https://bugs.debian.org/541828
|
|
|
|
|
|
|
|
Patch headers added by debian/patches/features/all/aufs4/gen-patch
|
|
|
|
|
2015-12-10 18:25:40 +00:00
|
|
|
aufs4.x-rcN base patch
|
2015-06-16 22:42:42 +00:00
|
|
|
|
|
|
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
2016-02-15 16:36:21 +00:00
|
|
|
index 7f1fa4f..d910255 100644
|
2015-06-16 22:42:42 +00:00
|
|
|
--- a/MAINTAINERS
|
|
|
|
+++ b/MAINTAINERS
|
2016-02-15 16:36:21 +00:00
|
|
|
@@ -2075,6 +2075,19 @@ F: include/linux/audit.h
|
2015-06-16 22:42:42 +00:00
|
|
|
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://github.com/sfjro/aufs4-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
|
2015-12-10 18:25:40 +00:00
|
|
|
index 423f4ca..abfdd2b 100644
|
2015-06-16 22:42:42 +00:00
|
|
|
--- a/drivers/block/loop.c
|
|
|
|
+++ b/drivers/block/loop.c
|
2015-12-10 18:25:40 +00:00
|
|
|
@@ -706,6 +706,24 @@ static inline int is_loop_device(struct file *file)
|
2015-06-16 22:42:42 +00:00
|
|
|
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/dcache.c b/fs/dcache.c
|
2016-02-15 16:36:21 +00:00
|
|
|
index 92d5140..63b22d7 100644
|
2015-06-16 22:42:42 +00:00
|
|
|
--- a/fs/dcache.c
|
|
|
|
+++ b/fs/dcache.c
|
2015-11-17 14:57:05 +00:00
|
|
|
@@ -1167,7 +1167,7 @@ enum d_walk_ret {
|
2015-06-16 22:42:42 +00:00
|
|
|
*
|
|
|
|
* The @enter() and @finish() callbacks are called with d_lock held.
|
|
|
|
*/
|
|
|
|
-static void d_walk(struct dentry *parent, void *data,
|
|
|
|
+void d_walk(struct dentry *parent, void *data,
|
|
|
|
enum d_walk_ret (*enter)(void *, struct dentry *),
|
|
|
|
void (*finish)(void *))
|
|
|
|
{
|
|
|
|
diff --git a/fs/read_write.c b/fs/read_write.c
|
2016-02-15 16:36:21 +00:00
|
|
|
index 324ec27..d38892e 100644
|
2015-06-16 22:42:42 +00:00
|
|
|
--- a/fs/read_write.c
|
|
|
|
+++ b/fs/read_write.c
|
2016-02-15 16:36:21 +00:00
|
|
|
@@ -533,6 +533,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
|
2015-06-16 22:42:42 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__vfs_write);
|
|
|
|
|
|
|
|
+vfs_readf_t vfs_readf(struct file *file)
|
|
|
|
+{
|
|
|
|
+ const struct file_operations *fop = file->f_op;
|
|
|
|
+
|
|
|
|
+ if (fop->read)
|
|
|
|
+ return fop->read;
|
|
|
|
+ if (fop->read_iter)
|
|
|
|
+ return new_sync_read;
|
|
|
|
+ return ERR_PTR(-ENOSYS);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+vfs_writef_t vfs_writef(struct file *file)
|
|
|
|
+{
|
|
|
|
+ const struct file_operations *fop = file->f_op;
|
|
|
|
+
|
|
|
|
+ if (fop->write)
|
|
|
|
+ return fop->write;
|
|
|
|
+ if (fop->write_iter)
|
|
|
|
+ return new_sync_write;
|
|
|
|
+ return ERR_PTR(-ENOSYS);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
|
|
|
|
{
|
|
|
|
mm_segment_t old_fs;
|
|
|
|
diff --git a/fs/splice.c b/fs/splice.c
|
2016-02-15 16:36:21 +00:00
|
|
|
index 82bc0d6..93aee51 100644
|
2015-06-16 22:42:42 +00:00
|
|
|
--- a/fs/splice.c
|
|
|
|
+++ b/fs/splice.c
|
2016-02-15 16:36:21 +00:00
|
|
|
@@ -1108,8 +1108,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
|
2015-06-16 22:42:42 +00:00
|
|
|
/*
|
|
|
|
* 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);
|
2016-02-15 16:36:21 +00:00
|
|
|
@@ -1125,9 +1125,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
2015-06-16 22:42:42 +00:00
|
|
|
/*
|
|
|
|
* 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/file.h b/include/linux/file.h
|
|
|
|
index f87d308..9a290b3 100644
|
|
|
|
--- a/include/linux/file.h
|
|
|
|
+++ b/include/linux/file.h
|
|
|
|
@@ -19,6 +19,7 @@ struct dentry;
|
|
|
|
struct path;
|
|
|
|
extern struct file *alloc_file(struct path *, fmode_t mode,
|
|
|
|
const struct file_operations *fop);
|
|
|
|
+extern struct file *get_empty_filp(void);
|
|
|
|
|
|
|
|
static inline void fput_light(struct file *file, int fput_needed)
|
|
|
|
{
|
|
|
|
diff --git a/include/linux/fs.h b/include/linux/fs.h
|
2016-02-15 16:36:21 +00:00
|
|
|
index ae68100..2ea096b 100644
|
2015-06-16 22:42:42 +00:00
|
|
|
--- a/include/linux/fs.h
|
|
|
|
+++ b/include/linux/fs.h
|
2016-02-15 16:36:21 +00:00
|
|
|
@@ -1704,6 +1704,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
|
2015-06-16 22:42:42 +00:00
|
|
|
struct iovec *fast_pointer,
|
|
|
|
struct iovec **ret_pointer);
|
|
|
|
|
|
|
|
+typedef ssize_t (*vfs_readf_t)(struct file *, char __user *, size_t, loff_t *);
|
|
|
|
+typedef ssize_t (*vfs_writef_t)(struct file *, const char __user *, size_t,
|
|
|
|
+ loff_t *);
|
|
|
|
+vfs_readf_t vfs_readf(struct file *file);
|
|
|
|
+vfs_writef_t vfs_writef(struct file *file);
|
|
|
|
+
|
|
|
|
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
|
|
|
|
extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *);
|
|
|
|
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
|
|
|
|
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
|