2012-01-22 08:13:29 +00:00
|
|
|
aufs3.2 base patch
|
2011-09-23 18:35:45 +00:00
|
|
|
|
|
|
|
|
diff --git a/fs/namei.c b/fs/namei.c
|
2012-01-22 08:13:29 +00:00
|
|
|
index 5008f01..4cc94cf 100644
|
2011-09-23 18:35:45 +00:00
|
|
|
--- a/fs/namei.c
|
|
|
|
|
+++ b/fs/namei.c
|
2012-01-22 08:13:29 +00:00
|
|
|
@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
|
2011-09-23 18:35:45 +00:00
|
|
|
* 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);
|
|
|
|
|
}
|
|
|
|
|
diff --git a/fs/splice.c b/fs/splice.c
|
2011-11-09 19:33:09 +00:00
|
|
|
index fa2defa..e3569b0 100644
|
2011-09-23 18:35:45 +00:00
|
|
|
--- a/fs/splice.c
|
|
|
|
|
+++ b/fs/splice.c
|
|
|
|
|
@@ -1085,8 +1085,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);
|
|
|
|
|
@@ -1113,9 +1113,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/namei.h b/include/linux/namei.h
|
2012-01-22 08:13:29 +00:00
|
|
|
index ffc0213..ef35a31 100644
|
2011-09-23 18:35:45 +00:00
|
|
|
--- a/include/linux/namei.h
|
|
|
|
|
+++ b/include/linux/namei.h
|
2012-01-22 08:13:29 +00:00
|
|
|
@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
|
2011-09-23 18:35:45 +00:00
|
|
|
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 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
|
2011-11-09 19:33:09 +00:00
|
|
|
index 26e5b61..3ffef2f 100644
|
2011-09-23 18:35:45 +00:00
|
|
|
--- a/include/linux/splice.h
|
|
|
|
|
+++ b/include/linux/splice.h
|
2011-11-09 19:33:09 +00:00
|
|
|
@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
|
|
|
|
|
extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
|
2011-09-23 18:35:45 +00:00
|
|
|
|
2011-11-09 19:33:09 +00:00
|
|
|
extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
|
|
|
|
|
+
|
2011-09-23 18:35:45 +00:00
|
|
|
+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
|
