wok annotate linux/stuff/aufs2-base.patch @ rev 13480

lynx: improve receipt
author Eric Joseph-Alexandre <erjo@slitaz.org>
date Thu Oct 11 10:29:44 2012 +0200 (2012-10-11)
parents 34e3298168a8
children
rev   line source
pankso@12285 1 aufs2.1 base patch for linux-2.6.
gokhlayeh@8761 2
gokhlayeh@8761 3 diff --git a/fs/namei.c b/fs/namei.c
pankso@12285 4 index 5c867dd..95978ec 100644
gokhlayeh@8761 5 --- a/fs/namei.c
gokhlayeh@8761 6 +++ b/fs/namei.c
pankso@12285 7 @@ -1692,7 +1692,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
gokhlayeh@8761 8 * needs parent already locked. Doesn't follow mounts.
gokhlayeh@8761 9 * SMP-safe.
gokhlayeh@8761 10 */
gokhlayeh@8761 11 -static struct dentry *lookup_hash(struct nameidata *nd)
gokhlayeh@8761 12 +struct dentry *lookup_hash(struct nameidata *nd)
gokhlayeh@8761 13 {
gokhlayeh@8761 14 return __lookup_hash(&nd->last, nd->path.dentry, nd);
gokhlayeh@8761 15 }
gokhlayeh@8761 16 diff --git a/fs/splice.c b/fs/splice.c
pankso@12285 17 index aa866d3..19afec6 100644
gokhlayeh@8761 18 --- a/fs/splice.c
gokhlayeh@8761 19 +++ b/fs/splice.c
pankso@12285 20 @@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
gokhlayeh@8761 21 /*
gokhlayeh@8761 22 * Attempt to initiate a splice from pipe to file.
gokhlayeh@8761 23 */
gokhlayeh@8761 24 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@8761 25 - loff_t *ppos, size_t len, unsigned int flags)
gokhlayeh@8761 26 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@8761 27 + loff_t *ppos, size_t len, unsigned int flags)
gokhlayeh@8761 28 {
gokhlayeh@8761 29 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
gokhlayeh@8761 30 loff_t *, size_t, unsigned int);
pankso@12285 31 @@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@8761 32 /*
gokhlayeh@8761 33 * Attempt to initiate a splice from a file to a pipe.
gokhlayeh@8761 34 */
gokhlayeh@8761 35 -static long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@8761 36 - struct pipe_inode_info *pipe, size_t len,
gokhlayeh@8761 37 - unsigned int flags)
gokhlayeh@8761 38 +long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@8761 39 + struct pipe_inode_info *pipe, size_t len,
gokhlayeh@8761 40 + unsigned int flags)
gokhlayeh@8761 41 {
gokhlayeh@8761 42 ssize_t (*splice_read)(struct file *, loff_t *,
gokhlayeh@8761 43 struct pipe_inode_info *, size_t, unsigned int);
gokhlayeh@8761 44 diff --git a/include/linux/namei.h b/include/linux/namei.h
pankso@12285 45 index eba45ea..21ed6c9 100644
gokhlayeh@8761 46 --- a/include/linux/namei.h
gokhlayeh@8761 47 +++ b/include/linux/namei.h
pankso@12285 48 @@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
gokhlayeh@8761 49 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
gokhlayeh@8761 50 int (*open)(struct inode *, struct file *));
gokhlayeh@8761 51
gokhlayeh@8761 52 +extern struct dentry *lookup_hash(struct nameidata *nd);
gokhlayeh@8761 53 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
gokhlayeh@8761 54
pankso@12285 55 extern int follow_down_one(struct path *);
gokhlayeh@8761 56 diff --git a/include/linux/splice.h b/include/linux/splice.h
gokhlayeh@8761 57 index 997c3b4..be9a153 100644
gokhlayeh@8761 58 --- a/include/linux/splice.h
gokhlayeh@8761 59 +++ b/include/linux/splice.h
gokhlayeh@8761 60 @@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
gokhlayeh@8761 61 extern void splice_shrink_spd(struct pipe_inode_info *,
gokhlayeh@8761 62 struct splice_pipe_desc *);
gokhlayeh@8761 63
gokhlayeh@8761 64 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@8761 65 + loff_t *ppos, size_t len, unsigned int flags);
gokhlayeh@8761 66 +extern long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@8761 67 + struct pipe_inode_info *pipe, size_t len,
gokhlayeh@8761 68 + unsigned int flags);
gokhlayeh@8761 69 +
gokhlayeh@8761 70 #endif