diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-11-07 02:11:12 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 15:48:48 -0600 |
| commit | ff469593fdbe99ca66719115b6e89800ea380988 (patch) | |
| tree | 37e98288f8dc209ee520b0c0ef73ba505c6077be | |
| parent | 0ae0691320f862b816a47fe6abed11f84b9dfd8d (diff) | |
Revert "UBUNTU: ubuntu: AUFS -- aufs2 base patch for linux-2.6.34"
This reverts commit 8e85bed37962e980e0a72cc3a8eb5fd9b16df630.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
| -rw-r--r-- | fs/namei.c | 4 | ||||
| -rw-r--r-- | fs/splice.c | 10 | ||||
| -rw-r--r-- | include/linux/namei.h | 3 | ||||
| -rw-r--r-- | include/linux/splice.h | 6 |
4 files changed, 7 insertions, 16 deletions
diff --git a/fs/namei.c b/fs/namei.c index 05135631d106..a4689eb2df28 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1842,12 +1842,12 @@ out: * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ -struct dentry *lookup_hash(struct nameidata *nd) +static struct dentry *lookup_hash(struct nameidata *nd) { return __lookup_hash(&nd->last, nd->path.dentry, nd); } -int __lookup_one_len(const char *name, struct qstr *this, +static int __lookup_one_len(const char *name, struct qstr *this, struct dentry *base, int len) { unsigned long hash; diff --git a/fs/splice.c b/fs/splice.c index 886e942cf0f9..50a5d978da16 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1081,8 +1081,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ -long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - loff_t *ppos, size_t len, unsigned int flags) +static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags) { ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); @@ -1109,9 +1109,9 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, /* * Attempt to initiate a splice from a file to a pipe. */ -long do_splice_to(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, size_t len, - unsigned int flags) +static long do_splice_to(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) { ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); diff --git a/include/linux/namei.h b/include/linux/namei.h index 4eb5fcb0e3e4..f276d4fa01fc 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -79,9 +79,6 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, int (*open)(struct inode *, struct file *)); -extern struct dentry *lookup_hash(struct nameidata *nd); -extern int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len); extern struct dentry *lookup_one_len(const char *, struct dentry *, int); extern int follow_down_one(struct path *); diff --git a/include/linux/splice.h b/include/linux/splice.h index 5ae0b8542a8e..997c3b4c212b 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -82,12 +82,6 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, splice_direct_actor *); -extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - loff_t *ppos, size_t len, unsigned int flags); -extern long do_splice_to(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, size_t len, - unsigned int flags); - /* * for dynamic pipe sizing */ |