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

Up e2fsprogs (1.44.2)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Mar 04 18:42:23 2019 +0100 (2019-03-04)
parents
children
rev   line source
gokhlayeh@8761 1 aufs2.1 base patch for linux-2.6.37
gokhlayeh@8761 2
gokhlayeh@8761 3 diff --git a/fs/namei.c b/fs/namei.c
gokhlayeh@8761 4 index 4ff7ca5..a8c583f 100644
gokhlayeh@8761 5 --- a/fs/namei.c
gokhlayeh@8761 6 +++ b/fs/namei.c
gokhlayeh@8761 7 @@ -1161,12 +1161,12 @@ out:
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
gokhlayeh@8761 17 -static int __lookup_one_len(const char *name, struct qstr *this,
gokhlayeh@8761 18 +int __lookup_one_len(const char *name, struct qstr *this,
gokhlayeh@8761 19 struct dentry *base, int len)
gokhlayeh@8761 20 {
gokhlayeh@8761 21 unsigned long hash;
gokhlayeh@8761 22 diff --git a/fs/splice.c b/fs/splice.c
gokhlayeh@8761 23 index ce2f025..ff0ae69 100644
gokhlayeh@8761 24 --- a/fs/splice.c
gokhlayeh@8761 25 +++ b/fs/splice.c
gokhlayeh@8761 26 @@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
gokhlayeh@8761 27 /*
gokhlayeh@8761 28 * Attempt to initiate a splice from pipe to file.
gokhlayeh@8761 29 */
gokhlayeh@8761 30 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@8761 31 - loff_t *ppos, size_t len, unsigned int flags)
gokhlayeh@8761 32 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@8761 33 + loff_t *ppos, size_t len, unsigned int flags)
gokhlayeh@8761 34 {
gokhlayeh@8761 35 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
gokhlayeh@8761 36 loff_t *, size_t, unsigned int);
gokhlayeh@8761 37 @@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@8761 38 /*
gokhlayeh@8761 39 * Attempt to initiate a splice from a file to a pipe.
gokhlayeh@8761 40 */
gokhlayeh@8761 41 -static long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@8761 42 - struct pipe_inode_info *pipe, size_t len,
gokhlayeh@8761 43 - unsigned int flags)
gokhlayeh@8761 44 +long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@8761 45 + struct pipe_inode_info *pipe, size_t len,
gokhlayeh@8761 46 + unsigned int flags)
gokhlayeh@8761 47 {
gokhlayeh@8761 48 ssize_t (*splice_read)(struct file *, loff_t *,
gokhlayeh@8761 49 struct pipe_inode_info *, size_t, unsigned int);
gokhlayeh@8761 50 diff --git a/include/linux/namei.h b/include/linux/namei.h
gokhlayeh@8761 51 index 05b441d..91bc74e 100644
gokhlayeh@8761 52 --- a/include/linux/namei.h
gokhlayeh@8761 53 +++ b/include/linux/namei.h
gokhlayeh@8761 54 @@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
gokhlayeh@8761 55 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
gokhlayeh@8761 56 int (*open)(struct inode *, struct file *));
gokhlayeh@8761 57
gokhlayeh@8761 58 +extern struct dentry *lookup_hash(struct nameidata *nd);
gokhlayeh@8761 59 +extern int __lookup_one_len(const char *name, struct qstr *this,
gokhlayeh@8761 60 + struct dentry *base, int len);
gokhlayeh@8761 61 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
gokhlayeh@8761 62
gokhlayeh@8761 63 extern int follow_down(struct path *);
gokhlayeh@8761 64 diff --git a/include/linux/splice.h b/include/linux/splice.h
gokhlayeh@8761 65 index 997c3b4..be9a153 100644
gokhlayeh@8761 66 --- a/include/linux/splice.h
gokhlayeh@8761 67 +++ b/include/linux/splice.h
gokhlayeh@8761 68 @@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
gokhlayeh@8761 69 extern void splice_shrink_spd(struct pipe_inode_info *,
gokhlayeh@8761 70 struct splice_pipe_desc *);
gokhlayeh@8761 71
gokhlayeh@8761 72 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
gokhlayeh@8761 73 + loff_t *ppos, size_t len, unsigned int flags);
gokhlayeh@8761 74 +extern long do_splice_to(struct file *in, loff_t *ppos,
gokhlayeh@8761 75 + struct pipe_inode_info *pipe, size_t len,
gokhlayeh@8761 76 + unsigned int flags);
gokhlayeh@8761 77 +
gokhlayeh@8761 78 #endif