SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linux/stuff/aufs3-base.patch	Wed Jan 01 19:09:17 2014 +0100
     1.3 @@ -0,0 +1,70 @@
     1.4 +aufs3.2 base patch
     1.5 +
     1.6 +diff --git a/fs/namei.c b/fs/namei.c
     1.7 +index 5008f01..4cc94cf 100644
     1.8 +--- a/fs/namei.c
     1.9 ++++ b/fs/namei.c
    1.10 +@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
    1.11 +  * needs parent already locked. Doesn't follow mounts.
    1.12 +  * SMP-safe.
    1.13 +  */
    1.14 +-static struct dentry *lookup_hash(struct nameidata *nd)
    1.15 ++struct dentry *lookup_hash(struct nameidata *nd)
    1.16 + {
    1.17 + 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
    1.18 + }
    1.19 +diff --git a/fs/splice.c b/fs/splice.c
    1.20 +index fa2defa..e3569b0 100644
    1.21 +--- a/fs/splice.c
    1.22 ++++ b/fs/splice.c
    1.23 +@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
    1.24 + /*
    1.25 +  * Attempt to initiate a splice from pipe to file.
    1.26 +  */
    1.27 +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.28 +-			   loff_t *ppos, size_t len, unsigned int flags)
    1.29 ++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.30 ++		    loff_t *ppos, size_t len, unsigned int flags)
    1.31 + {
    1.32 + 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
    1.33 + 				loff_t *, size_t, unsigned int);
    1.34 +@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.35 + /*
    1.36 +  * Attempt to initiate a splice from a file to a pipe.
    1.37 +  */
    1.38 +-static long do_splice_to(struct file *in, loff_t *ppos,
    1.39 +-			 struct pipe_inode_info *pipe, size_t len,
    1.40 +-			 unsigned int flags)
    1.41 ++long do_splice_to(struct file *in, loff_t *ppos,
    1.42 ++		  struct pipe_inode_info *pipe, size_t len,
    1.43 ++		  unsigned int flags)
    1.44 + {
    1.45 + 	ssize_t (*splice_read)(struct file *, loff_t *,
    1.46 + 			       struct pipe_inode_info *, size_t, unsigned int);
    1.47 +diff --git a/include/linux/namei.h b/include/linux/namei.h
    1.48 +index ffc0213..ef35a31 100644
    1.49 +--- a/include/linux/namei.h
    1.50 ++++ b/include/linux/namei.h
    1.51 +@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
    1.52 + extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
    1.53 + 		int (*open)(struct inode *, struct file *));
    1.54 + 
    1.55 ++extern struct dentry *lookup_hash(struct nameidata *nd);
    1.56 + extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
    1.57 + 
    1.58 + extern int follow_down_one(struct path *);
    1.59 +diff --git a/include/linux/splice.h b/include/linux/splice.h
    1.60 +index 26e5b61..3ffef2f 100644
    1.61 +--- a/include/linux/splice.h
    1.62 ++++ b/include/linux/splice.h
    1.63 +@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
    1.64 + extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
    1.65 + 
    1.66 + extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
    1.67 ++
    1.68 ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.69 ++			   loff_t *ppos, size_t len, unsigned int flags);
    1.70 ++extern long do_splice_to(struct file *in, loff_t *ppos,
    1.71 ++			 struct pipe_inode_info *pipe, size_t len,
    1.72 ++			 unsigned int flags);
    1.73 + #endif