summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-05-23 06:37:25 +0000
committerJustin Lecher <jlec@gentoo.org>2012-05-23 06:37:25 +0000
commit6efdb4420153e302b632e1251721f03fa68d4e2b (patch)
tree632e980da21f62d5d2dcf613c1bb853b0d490f42 /sys-fs/aufs3/files/aufs3-base-4.patch
parentRemove old. (diff)
downloadhistorical-6efdb4420153e302b632e1251721f03fa68d4e2b.tar.gz
historical-6efdb4420153e302b632e1251721f03fa68d4e2b.tar.bz2
historical-6efdb4420153e302b632e1251721f03fa68d4e2b.zip
sys-fs/aufs3: Add missing patches
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/aufs3/files/aufs3-base-4.patch')
-rw-r--r--sys-fs/aufs3/files/aufs3-base-4.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/sys-fs/aufs3/files/aufs3-base-4.patch b/sys-fs/aufs3/files/aufs3-base-4.patch
new file mode 100644
index 000000000000..d639d79bd228
--- /dev/null
+++ b/sys-fs/aufs3/files/aufs3-base-4.patch
@@ -0,0 +1,70 @@
+aufs3.4 base patch
+
+diff --git a/fs/namei.c b/fs/namei.c
+index c427919..7ff959b 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
+ * needs parent already locked. Doesn't follow mounts.
+ * SMP-safe.
+ */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+diff --git a/fs/splice.c b/fs/splice.c
+index f847684..f871233 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1084,8 +1084,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);
+@@ -1112,9 +1112,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/namei.h b/include/linux/namei.h
+index ffc0213..ef35a31 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ int (*open)(struct inode *, struct file *));
+
++extern struct dentry *lookup_hash(struct nameidata *nd);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+
+ extern int follow_down_one(struct path *);
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 26e5b61..3ffef2f 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
+ 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