wok-6.x annotate linux-libre/stuff/aufs2-base.patch @ rev 17615

Fix: gpick build
author Alexander Medvedev <devl547@gmail.com>
date Thu Feb 12 20:33:54 2015 +0000 (2015-02-12)
parents
children
rev   line source
gokhlayeh@9257 1 aufs2.1 base patch for linux-2.6.37
gokhlayeh@9257 2
gokhlayeh@9257 3 diff --git a/fs/namei.c b/fs/namei.c
gokhlayeh@9257 4 index 4ff7ca5..a8c583f 100644
gokhlayeh@9257 5 --- a/fs/namei.c
gokhlayeh@9257 6 +++ b/fs/namei.c
gokhlayeh@9257 7 @@ -1161,12 +1161,12 @@ out:
gokhlayeh@9257 8 * needs parent already locked. Doesn't follow mounts.
gokhlayeh@9257 9 * SMP-safe.
gokhlayeh@9257 10 */
gokhlayeh@9257 11 -static struct dentry *lookup_hash(struct nameidata *nd)
gokhlayeh@9257 12 +struct dentry *lookup_hash(struct nameidata *nd)
gokhlayeh@9257 13 {
gokhlayeh@9257 14 return __lookup_hash(&nd->last, nd->path.dentry, nd);
gokhlayeh@9257 15 }
gokhlayeh@9257 16
gokhlayeh@9257 17 -static int __lookup_one_len(const char *name, struct qstr *this,
gokhlayeh@9257 18 +int __lookup_one_len(const char *name, struct qstr *this,
gokhlayeh@9257 19 struct dentry *base, int len)
gokhlayeh@9257 20 {
gokhlayeh@9257 21 unsigned long hash;
gokhlayeh@9257 22 diff --git a/fs/splice.c b/fs/splice.c
gokhlayeh@9257 23 index ce2f025..ff0ae69 100644
gokhlayeh@9257 24 --- a/fs/splice.c
gokhlayeh@9257 25 +++ b/fs/splice.c
gokhlayeh@9257 26 @@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
gokhlayeh@9257 27 /*
gokhlayeh@9257 28 * Attempt to initiate a splice from pipe to file.
gokhlayeh@9257 29 */
gokhlayeh@9257 30 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@9257 31 - loff_t *ppos, size_t len, unsigned int flags)
gokhlayeh@9257 32 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@9257 33 + loff_t *ppos, size_t len, unsigned int flags)
gokhlayeh@9257 34 {
gokhlayeh@9257 35 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
gokhlayeh@9257 36 loff_t *, size_t, unsigned int);
gokhlayeh@9257 37 @@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@9257 38 /*
gokhlayeh@9257 39 * Attempt to initiate a splice from a file to a pipe.
gokhlayeh@9257 40 */
gokhlayeh@9257 41 -static long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@9257 42 - struct pipe_inode_info *pipe, size_t len,
gokhlayeh@9257 43 - unsigned int flags)
gokhlayeh@9257 44 +long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@9257 45 + struct pipe_inode_info *pipe, size_t len,
gokhlayeh@9257 46 + unsigned int flags)
gokhlayeh@9257 47 {
gokhlayeh@9257 48 ssize_t (*splice_read)(struct file *, loff_t *,
gokhlayeh@9257 49 struct pipe_inode_info *, size_t, unsigned int);
gokhlayeh@9257 50 diff --git a/include/linux/namei.h b/include/linux/namei.h
gokhlayeh@9257 51 index 05b441d..91bc74e 100644
gokhlayeh@9257 52 --- a/include/linux/namei.h
gokhlayeh@9257 53 +++ b/include/linux/namei.h
gokhlayeh@9257 54 @@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
gokhlayeh@9257 55 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
gokhlayeh@9257 56 int (*open)(struct inode *, struct file *));
gokhlayeh@9257 57
gokhlayeh@9257 58 +extern struct dentry *lookup_hash(struct nameidata *nd);
gokhlayeh@9257 59 +extern int __lookup_one_len(const char *name, struct qstr *this,
gokhlayeh@9257 60 + struct dentry *base, int len);
gokhlayeh@9257 61 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
gokhlayeh@9257 62
gokhlayeh@9257 63 extern int follow_down(struct path *);
gokhlayeh@9257 64 diff --git a/include/linux/splice.h b/include/linux/splice.h
gokhlayeh@9257 65 index 997c3b4..be9a153 100644
gokhlayeh@9257 66 --- a/include/linux/splice.h
gokhlayeh@9257 67 +++ b/include/linux/splice.h
gokhlayeh@9257 68 @@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
gokhlayeh@9257 69 extern void splice_shrink_spd(struct pipe_inode_info *,
gokhlayeh@9257 70 struct splice_pipe_desc *);
gokhlayeh@9257 71
gokhlayeh@9257 72 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@9257 73 + loff_t *ppos, size_t len, unsigned int flags);
gokhlayeh@9257 74 +extern long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@9257 75 + struct pipe_inode_info *pipe, size_t len,
gokhlayeh@9257 76 + unsigned int flags);
gokhlayeh@9257 77 +
gokhlayeh@9257 78 #endif