diff options
author | Tobias Powalowski <tobias@T-POWA-LX.(none)> | 2011-05-20 08:28:42 +0200 |
---|---|---|
committer | Tobias Powalowski <tobias@T-POWA-LX.(none)> | 2011-05-20 08:28:42 +0200 |
commit | a8b7bd7ccc1657b8475a6a871dd79b9a55adc53c (patch) | |
tree | a6be337d0461bb8f7bfe0490b3b929dd46bf3083 /patches/aufs2-base-20110314.patch | |
parent | 353479044853da81c8289e8c0ef5e2eba0395cc3 (diff) |
bump to 2.6.39 series
Diffstat (limited to 'patches/aufs2-base-20110314.patch')
-rw-r--r-- | patches/aufs2-base-20110314.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/patches/aufs2-base-20110314.patch b/patches/aufs2-base-20110314.patch deleted file mode 100644 index 5b29f65..0000000 --- a/patches/aufs2-base-20110314.patch +++ /dev/null @@ -1,78 +0,0 @@ -aufs2.1 base patch for linux-2.6. - -diff --git a/fs/namei.c b/fs/namei.c -index 0087cf9..cd39cdf 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1841,12 +1841,12 @@ out: - * 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); - } - --static int __lookup_one_len(const char *name, struct qstr *this, -+int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) - { - unsigned long hash; -diff --git a/fs/splice.c b/fs/splice.c -index 50a5d97..886e942 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1081,8 +1081,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); -@@ -1109,9 +1109,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 f276d4f..4eb5fcb 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -79,6 +79,9 @@ 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 int __lookup_one_len(const char *name, struct qstr *this, -+ struct dentry *base, int len); - 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 997c3b4..be9a153 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+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 |