SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linux/stuff/aufs2-base.patch	Wed Apr 21 00:04:15 2010 +0000
     1.3 @@ -0,0 +1,81 @@
     1.4 +aufs2 base patch for linux-2.6.33
     1.5 +
     1.6 +diff --git a/fs/namei.c b/fs/namei.c
     1.7 +index a4855af..1d12d37 100644
     1.8 +--- a/fs/namei.c
     1.9 ++++ b/fs/namei.c
    1.10 +@@ -1207,7 +1207,7 @@ out:
    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 + 	int err;
    1.18 + 
    1.19 +@@ -1217,7 +1217,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
    1.20 + 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
    1.21 + }
    1.22 + 
    1.23 +-static int __lookup_one_len(const char *name, struct qstr *this,
    1.24 ++int __lookup_one_len(const char *name, struct qstr *this,
    1.25 + 		struct dentry *base, int len)
    1.26 + {
    1.27 + 	unsigned long hash;
    1.28 +diff --git a/fs/splice.c b/fs/splice.c
    1.29 +index 3920866..b13a9a2 100644
    1.30 +--- a/fs/splice.c
    1.31 ++++ b/fs/splice.c
    1.32 +@@ -1053,8 +1053,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
    1.33 + /*
    1.34 +  * Attempt to initiate a splice from pipe to file.
    1.35 +  */
    1.36 +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.37 +-			   loff_t *ppos, size_t len, unsigned int flags)
    1.38 ++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.39 ++		    loff_t *ppos, size_t len, unsigned int flags)
    1.40 + {
    1.41 + 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
    1.42 + 				loff_t *, size_t, unsigned int);
    1.43 +@@ -1081,9 +1081,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.44 + /*
    1.45 +  * Attempt to initiate a splice from a file to a pipe.
    1.46 +  */
    1.47 +-static long do_splice_to(struct file *in, loff_t *ppos,
    1.48 +-			 struct pipe_inode_info *pipe, size_t len,
    1.49 +-			 unsigned int flags)
    1.50 ++long do_splice_to(struct file *in, loff_t *ppos,
    1.51 ++		  struct pipe_inode_info *pipe, size_t len,
    1.52 ++		  unsigned int flags)
    1.53 + {
    1.54 + 	ssize_t (*splice_read)(struct file *, loff_t *,
    1.55 + 			       struct pipe_inode_info *, size_t, unsigned int);
    1.56 +diff --git a/include/linux/namei.h b/include/linux/namei.h
    1.57 +index 05b441d..91bc74e 100644
    1.58 +--- a/include/linux/namei.h
    1.59 ++++ b/include/linux/namei.h
    1.60 +@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
    1.61 + extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
    1.62 + 		int (*open)(struct inode *, struct file *));
    1.63 + 
    1.64 ++extern struct dentry *lookup_hash(struct nameidata *nd);
    1.65 ++extern int __lookup_one_len(const char *name, struct qstr *this,
    1.66 ++			    struct dentry *base, int len);
    1.67 + extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
    1.68 + 
    1.69 + extern int follow_down(struct path *);
    1.70 +diff --git a/include/linux/splice.h b/include/linux/splice.h
    1.71 +index 18e7c7c..8393b5c 100644
    1.72 +--- a/include/linux/splice.h
    1.73 ++++ b/include/linux/splice.h
    1.74 +@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
    1.75 + extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
    1.76 + 				      splice_direct_actor *);
    1.77 + 
    1.78 ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    1.79 ++			   loff_t *ppos, size_t len, unsigned int flags);
    1.80 ++extern long do_splice_to(struct file *in, loff_t *ppos,
    1.81 ++			 struct pipe_inode_info *pipe, size_t len,
    1.82 ++			 unsigned int flags);
    1.83 ++
    1.84 + #endif