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

get-google-chrome: Fixed google-chrome-unstable DEPENDS
author Liu Peng <rocky@slitaz.org>
date Wed Apr 21 00:04:15 2010 +0000 (2010-04-21)
parents
children
rev   line source
pankso@5245 1 aufs2 base patch for linux-2.6.33
pankso@5245 2
pankso@5245 3 diff --git a/fs/namei.c b/fs/namei.c
pankso@5245 4 index a4855af..1d12d37 100644
pankso@5245 5 --- a/fs/namei.c
pankso@5245 6 +++ b/fs/namei.c
pankso@5245 7 @@ -1207,7 +1207,7 @@ out:
pankso@5245 8 * needs parent already locked. Doesn't follow mounts.
pankso@5245 9 * SMP-safe.
pankso@5245 10 */
pankso@5245 11 -static struct dentry *lookup_hash(struct nameidata *nd)
pankso@5245 12 +struct dentry *lookup_hash(struct nameidata *nd)
pankso@5245 13 {
pankso@5245 14 int err;
pankso@5245 15
pankso@5245 16 @@ -1217,7 +1217,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
pankso@5245 17 return __lookup_hash(&nd->last, nd->path.dentry, nd);
pankso@5245 18 }
pankso@5245 19
pankso@5245 20 -static int __lookup_one_len(const char *name, struct qstr *this,
pankso@5245 21 +int __lookup_one_len(const char *name, struct qstr *this,
pankso@5245 22 struct dentry *base, int len)
pankso@5245 23 {
pankso@5245 24 unsigned long hash;
pankso@5245 25 diff --git a/fs/splice.c b/fs/splice.c
pankso@5245 26 index 3920866..b13a9a2 100644
pankso@5245 27 --- a/fs/splice.c
pankso@5245 28 +++ b/fs/splice.c
pankso@5245 29 @@ -1053,8 +1053,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
pankso@5245 30 /*
pankso@5245 31 * Attempt to initiate a splice from pipe to file.
pankso@5245 32 */
pankso@5245 33 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
pankso@5245 34 - loff_t *ppos, size_t len, unsigned int flags)
pankso@5245 35 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
pankso@5245 36 + loff_t *ppos, size_t len, unsigned int flags)
pankso@5245 37 {
pankso@5245 38 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
pankso@5245 39 loff_t *, size_t, unsigned int);
pankso@5245 40 @@ -1081,9 +1081,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
pankso@5245 41 /*
pankso@5245 42 * Attempt to initiate a splice from a file to a pipe.
pankso@5245 43 */
pankso@5245 44 -static long do_splice_to(struct file *in, loff_t *ppos,
pankso@5245 45 - struct pipe_inode_info *pipe, size_t len,
pankso@5245 46 - unsigned int flags)
pankso@5245 47 +long do_splice_to(struct file *in, loff_t *ppos,
pankso@5245 48 + struct pipe_inode_info *pipe, size_t len,
pankso@5245 49 + unsigned int flags)
pankso@5245 50 {
pankso@5245 51 ssize_t (*splice_read)(struct file *, loff_t *,
pankso@5245 52 struct pipe_inode_info *, size_t, unsigned int);
pankso@5245 53 diff --git a/include/linux/namei.h b/include/linux/namei.h
pankso@5245 54 index 05b441d..91bc74e 100644
pankso@5245 55 --- a/include/linux/namei.h
pankso@5245 56 +++ b/include/linux/namei.h
pankso@5245 57 @@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
pankso@5245 58 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
pankso@5245 59 int (*open)(struct inode *, struct file *));
pankso@5245 60
pankso@5245 61 +extern struct dentry *lookup_hash(struct nameidata *nd);
pankso@5245 62 +extern int __lookup_one_len(const char *name, struct qstr *this,
pankso@5245 63 + struct dentry *base, int len);
pankso@5245 64 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
pankso@5245 65
pankso@5245 66 extern int follow_down(struct path *);
pankso@5245 67 diff --git a/include/linux/splice.h b/include/linux/splice.h
pankso@5245 68 index 18e7c7c..8393b5c 100644
pankso@5245 69 --- a/include/linux/splice.h
pankso@5245 70 +++ b/include/linux/splice.h
pankso@5245 71 @@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
pankso@5245 72 extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
pankso@5245 73 splice_direct_actor *);
pankso@5245 74
pankso@5245 75 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
pankso@5245 76 + loff_t *ppos, size_t len, unsigned int flags);
pankso@5245 77 +extern long do_splice_to(struct file *in, loff_t *ppos,
pankso@5245 78 + struct pipe_inode_info *pipe, size_t len,
pankso@5245 79 + unsigned int flags);
pankso@5245 80 +
pankso@5245 81 #endif