diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-11-22 15:04:58 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 15:50:26 -0600 |
| commit | e76f8f9393c3ed50607673a574318f2f7bbcb0cf (patch) | |
| tree | e11a089a4e3bc6397f05f5082ba23f9aa53efc31 /fs | |
| parent | 1b06bc07f1fdb131a92d2373da7a0b78244e71ad (diff) | |
Revert "UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103"
This reverts commit f628a4f95358f73b2393bec6c5a8df31b903e2ea.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 4 | ||||
| -rw-r--r-- | fs/splice.c | 10 |
2 files changed, 7 insertions, 7 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); |