diff options
author | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-03-12 01:16:00 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-03-12 01:16:00 -0300 |
commit | 0898dcbc181487ce82934f9f900b2a1772fd2da0 (patch) | |
tree | f3ae46a77fa698eac4f8786beff116e49132e1b2 /kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch | |
parent | 27c545ae9d8f8876469bed2eb8d11fdd6455992f (diff) | |
download | abslibre-0898dcbc181487ce82934f9f900b2a1772fd2da0.tar.gz abslibre-0898dcbc181487ce82934f9f900b2a1772fd2da0.tar.bz2 abslibre-0898dcbc181487ce82934f9f900b2a1772fd2da0.zip |
kernels/linux-libre-aufs_friendly
Diffstat (limited to 'kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch')
-rw-r--r-- | kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch new file mode 100644 index 000000000..ac30c8db9 --- /dev/null +++ b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch @@ -0,0 +1,70 @@ +aufs3.2 base patch + +diff --git a/fs/namei.c b/fs/namei.c +index 5008f01..4cc94cf 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name, + * 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 fa2defa..e3569b0 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1085,8 +1085,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); +@@ -1113,9 +1113,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 |