wok diff linux-libre/stuff/aufs2-base.patch @ rev 15230
gst-plugins-base, gst-plugins-bad: remove wrong error trigger
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Sep 22 18:47:20 2013 +0200 (2013-09-22) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/linux-libre/stuff/aufs2-base.patch Sun Sep 22 18:47:20 2013 +0200 1.3 @@ -0,0 +1,78 @@ 1.4 +aufs2.1 base patch for linux-2.6.37 1.5 + 1.6 +diff --git a/fs/namei.c b/fs/namei.c 1.7 +index 4ff7ca5..a8c583f 100644 1.8 +--- a/fs/namei.c 1.9 ++++ b/fs/namei.c 1.10 +@@ -1161,12 +1161,12 @@ 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 + return __lookup_hash(&nd->last, nd->path.dentry, nd); 1.18 + } 1.19 + 1.20 +-static int __lookup_one_len(const char *name, struct qstr *this, 1.21 ++int __lookup_one_len(const char *name, struct qstr *this, 1.22 + struct dentry *base, int len) 1.23 + { 1.24 + unsigned long hash; 1.25 +diff --git a/fs/splice.c b/fs/splice.c 1.26 +index ce2f025..ff0ae69 100644 1.27 +--- a/fs/splice.c 1.28 ++++ b/fs/splice.c 1.29 +@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); 1.30 + /* 1.31 + * Attempt to initiate a splice from pipe to file. 1.32 + */ 1.33 +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 1.34 +- loff_t *ppos, size_t len, unsigned int flags) 1.35 ++long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 1.36 ++ loff_t *ppos, size_t len, unsigned int flags) 1.37 + { 1.38 + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, 1.39 + loff_t *, size_t, unsigned int); 1.40 +@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 1.41 + /* 1.42 + * Attempt to initiate a splice from a file to a pipe. 1.43 + */ 1.44 +-static long do_splice_to(struct file *in, loff_t *ppos, 1.45 +- struct pipe_inode_info *pipe, size_t len, 1.46 +- unsigned int flags) 1.47 ++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 + { 1.51 + ssize_t (*splice_read)(struct file *, loff_t *, 1.52 + struct pipe_inode_info *, size_t, unsigned int); 1.53 +diff --git a/include/linux/namei.h b/include/linux/namei.h 1.54 +index 05b441d..91bc74e 100644 1.55 +--- a/include/linux/namei.h 1.56 ++++ b/include/linux/namei.h 1.57 +@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, 1.58 + extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, 1.59 + int (*open)(struct inode *, struct file *)); 1.60 + 1.61 ++extern struct dentry *lookup_hash(struct nameidata *nd); 1.62 ++extern int __lookup_one_len(const char *name, struct qstr *this, 1.63 ++ struct dentry *base, int len); 1.64 + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); 1.65 + 1.66 + extern int follow_down(struct path *); 1.67 +diff --git a/include/linux/splice.h b/include/linux/splice.h 1.68 +index 997c3b4..be9a153 100644 1.69 +--- a/include/linux/splice.h 1.70 ++++ b/include/linux/splice.h 1.71 +@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); 1.72 + extern void splice_shrink_spd(struct pipe_inode_info *, 1.73 + struct splice_pipe_desc *); 1.74 + 1.75 ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 1.76 ++ loff_t *ppos, size_t len, unsigned int flags); 1.77 ++extern long do_splice_to(struct file *in, loff_t *ppos, 1.78 ++ struct pipe_inode_info *pipe, size_t len, 1.79 ++ unsigned int flags); 1.80 ++ 1.81 + #endif