diff options
author | Andy Whitcroft <apw@canonical.com> | 2012-08-03 14:39:02 +0100 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2012-08-15 23:46:21 -0600 |
commit | 4f797abda25d5b5b6fc7bab757b483c8d4cb169c (patch) | |
tree | 44f71320622ed47fd960eb742463ca4d48477c95 | |
parent | d57d442a509f0d0a68ee2423404fcc403f09631c (diff) |
UBUNTU: ubuntu: AUFS -- aufs3-base.patch
Signed-off-by: Andy Whitcroft <apw@canonical.com>
-rw-r--r-- | fs/inode.c | 2 | ||||
-rw-r--r-- | fs/namei.c | 2 | ||||
-rw-r--r-- | fs/splice.c | 10 | ||||
-rw-r--r-- | include/linux/fs.h | 1 | ||||
-rw-r--r-- | include/linux/namei.h | 1 | ||||
-rw-r--r-- | include/linux/splice.h | 6 |
6 files changed, 15 insertions, 7 deletions
diff --git a/fs/inode.c b/fs/inode.c index 59cc8b0453a..8c376212f5a 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, * This does the actual work of updating an inodes time or version. Must have * had called mnt_want_write() before calling this. */ -static int update_time(struct inode *inode, struct timespec *time, int flags) +int update_time(struct inode *inode, struct timespec *time, int flags) { if (inode->i_op->update_time) return inode->i_op->update_time(inode, time, flags); diff --git a/fs/namei.c b/fs/namei.c index 9be439ae55c..410fadf6fb5 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2045,7 +2045,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ -static struct dentry *lookup_hash(struct nameidata *nd) +struct dentry *lookup_hash(struct nameidata *nd) { return __lookup_hash(&nd->last, nd->path.dentry, nd->flags); } diff --git a/fs/splice.c b/fs/splice.c index 2695a60a4fa..7c38c7d970f 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1093,8 +1093,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - loff_t *ppos, size_t len, unsigned int flags) +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); @@ -1121,9 +1121,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, /* * Attempt to initiate a splice from a file to a pipe. */ -static long do_splice_to(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, size_t len, - unsigned int flags) +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/fs.h b/include/linux/fs.h index d573703556d..6ee5a1a0b96 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2758,6 +2758,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *); extern int inode_newsize_ok(const struct inode *, loff_t offset); extern void setattr_copy(struct inode *inode, const struct iattr *attr); +extern int update_time(struct inode *, struct timespec *, int); extern int file_update_time(struct file *file); extern int generic_show_options(struct seq_file *m, struct dentry *root); diff --git a/include/linux/namei.h b/include/linux/namei.h index 4bf19d8174e..9788b083eeb 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -72,6 +72,7 @@ extern struct dentry *kern_path_locked(const char *, struct path *); extern int vfs_path_lookup(struct dentry *, struct vfsmount *, const char *, unsigned int, struct path *); +extern struct dentry *lookup_hash(struct nameidata *nd); 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 09a545a7dfa..1ac572794ce 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); extern void spd_release_page(struct splice_pipe_desc *, unsigned int); extern const struct pipe_buf_operations page_cache_pipe_buf_ops; + +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); #endif |