SliTaz Repositories

     1.1 --- a/linux/stuff/aufs2-base.patch	Mon Feb 21 04:39:34 2011 +0100
     1.2 +++ b/linux/stuff/aufs2-base.patch	Wed Jun 05 16:21:04 2013 +0200
     1.3 @@ -1,10 +1,10 @@
     1.4 -aufs2.1 base patch for linux-2.6.37
     1.5 +aufs2.1 base patch for linux-2.6.
     1.6  
     1.7  diff --git a/fs/namei.c b/fs/namei.c
     1.8 -index 4ff7ca5..a8c583f 100644
     1.9 +index 5c867dd..95978ec 100644
    1.10  --- a/fs/namei.c
    1.11  +++ b/fs/namei.c
    1.12 -@@ -1161,12 +1161,12 @@ out:
    1.13 +@@ -1692,7 +1692,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
    1.14    * needs parent already locked. Doesn't follow mounts.
    1.15    * SMP-safe.
    1.16    */
    1.17 @@ -13,17 +13,11 @@
    1.18   {
    1.19   	return __lookup_hash(&nd->last, nd->path.dentry, nd);
    1.20   }
    1.21 - 
    1.22 --static int __lookup_one_len(const char *name, struct qstr *this,
    1.23 -+int __lookup_one_len(const char *name, struct qstr *this,
    1.24 - 		struct dentry *base, int len)
    1.25 - {
    1.26 - 	unsigned long hash;
    1.27  diff --git a/fs/splice.c b/fs/splice.c
    1.28 -index ce2f025..ff0ae69 100644
    1.29 +index aa866d3..19afec6 100644
    1.30  --- a/fs/splice.c
    1.31  +++ b/fs/splice.c
    1.32 -@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
    1.33 +@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
    1.34   /*
    1.35    * Attempt to initiate a splice from pipe to file.
    1.36    */
    1.37 @@ -34,7 +28,7 @@
    1.38   {
    1.39   	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
    1.40   				loff_t *, size_t, unsigned int);
    1.41 -@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.42 +@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.43   /*
    1.44    * Attempt to initiate a splice from a file to a pipe.
    1.45    */
    1.46 @@ -48,19 +42,17 @@
    1.47   	ssize_t (*splice_read)(struct file *, loff_t *,
    1.48   			       struct pipe_inode_info *, size_t, unsigned int);
    1.49  diff --git a/include/linux/namei.h b/include/linux/namei.h
    1.50 -index 05b441d..91bc74e 100644
    1.51 +index eba45ea..21ed6c9 100644
    1.52  --- a/include/linux/namei.h
    1.53  +++ b/include/linux/namei.h
    1.54 -@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
    1.55 +@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
    1.56   extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
    1.57   		int (*open)(struct inode *, struct file *));
    1.58   
    1.59  +extern struct dentry *lookup_hash(struct nameidata *nd);
    1.60 -+extern int __lookup_one_len(const char *name, struct qstr *this,
    1.61 -+			    struct dentry *base, int len);
    1.62   extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
    1.63   
    1.64 - extern int follow_down(struct path *);
    1.65 + extern int follow_down_one(struct path *);
    1.66  diff --git a/include/linux/splice.h b/include/linux/splice.h
    1.67  index 997c3b4..be9a153 100644
    1.68  --- a/include/linux/splice.h