wok-next view linux/stuff/aufs3-base.patch @ rev 15733
linux: add CONFIG_X86_MSR and CONFIG_EFI
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Jan 01 19:09:17 2014 +0100 (2014-01-01) |
| parents | |
| children | a1084fda7f23 |
line source
1 aufs3.2 base patch
3 diff --git a/fs/namei.c b/fs/namei.c
4 index 5008f01..4cc94cf 100644
5 --- a/fs/namei.c
6 +++ b/fs/namei.c
7 @@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
8 * needs parent already locked. Doesn't follow mounts.
9 * SMP-safe.
10 */
11 -static struct dentry *lookup_hash(struct nameidata *nd)
12 +struct dentry *lookup_hash(struct nameidata *nd)
13 {
14 return __lookup_hash(&nd->last, nd->path.dentry, nd);
15 }
16 diff --git a/fs/splice.c b/fs/splice.c
17 index fa2defa..e3569b0 100644
18 --- a/fs/splice.c
19 +++ b/fs/splice.c
20 @@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
21 /*
22 * Attempt to initiate a splice from pipe to file.
23 */
24 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
25 - loff_t *ppos, size_t len, unsigned int flags)
26 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
27 + loff_t *ppos, size_t len, unsigned int flags)
28 {
29 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
30 loff_t *, size_t, unsigned int);
31 @@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
32 /*
33 * Attempt to initiate a splice from a file to a pipe.
34 */
35 -static long do_splice_to(struct file *in, loff_t *ppos,
36 - struct pipe_inode_info *pipe, size_t len,
37 - unsigned int flags)
38 +long do_splice_to(struct file *in, loff_t *ppos,
39 + struct pipe_inode_info *pipe, size_t len,
40 + unsigned int flags)
41 {
42 ssize_t (*splice_read)(struct file *, loff_t *,
43 struct pipe_inode_info *, size_t, unsigned int);
44 diff --git a/include/linux/namei.h b/include/linux/namei.h
45 index ffc0213..ef35a31 100644
46 --- a/include/linux/namei.h
47 +++ b/include/linux/namei.h
48 @@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
49 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
50 int (*open)(struct inode *, struct file *));
52 +extern struct dentry *lookup_hash(struct nameidata *nd);
53 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
55 extern int follow_down_one(struct path *);
56 diff --git a/include/linux/splice.h b/include/linux/splice.h
57 index 26e5b61..3ffef2f 100644
58 --- a/include/linux/splice.h
59 +++ b/include/linux/splice.h
60 @@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
61 extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
63 extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
64 +
65 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
66 + loff_t *ppos, size_t len, unsigned int flags);
67 +extern long do_splice_to(struct file *in, loff_t *ppos,
68 + struct pipe_inode_info *pipe, size_t len,
69 + unsigned int flags);
70 #endif