wok-next view linux-libre/stuff/aufs2-base.patch @ rev 16691
Fix /usr/share/locale/LC_MESSAGES/
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri May 23 04:30:03 2014 +0300 (2014-05-23) |
| parents | |
| children |
line source
1 aufs2.1 base patch for linux-2.6.37
3 diff --git a/fs/namei.c b/fs/namei.c
4 index 4ff7ca5..a8c583f 100644
5 --- a/fs/namei.c
6 +++ b/fs/namei.c
7 @@ -1161,12 +1161,12 @@ out:
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 }
17 -static int __lookup_one_len(const char *name, struct qstr *this,
18 +int __lookup_one_len(const char *name, struct qstr *this,
19 struct dentry *base, int len)
20 {
21 unsigned long hash;
22 diff --git a/fs/splice.c b/fs/splice.c
23 index ce2f025..ff0ae69 100644
24 --- a/fs/splice.c
25 +++ b/fs/splice.c
26 @@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
27 /*
28 * Attempt to initiate a splice from pipe to file.
29 */
30 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
31 - loff_t *ppos, size_t len, unsigned int flags)
32 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
33 + loff_t *ppos, size_t len, unsigned int flags)
34 {
35 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
36 loff_t *, size_t, unsigned int);
37 @@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
38 /*
39 * Attempt to initiate a splice from a file to a pipe.
40 */
41 -static long do_splice_to(struct file *in, loff_t *ppos,
42 - struct pipe_inode_info *pipe, size_t len,
43 - unsigned int flags)
44 +long do_splice_to(struct file *in, loff_t *ppos,
45 + struct pipe_inode_info *pipe, size_t len,
46 + unsigned int flags)
47 {
48 ssize_t (*splice_read)(struct file *, loff_t *,
49 struct pipe_inode_info *, size_t, unsigned int);
50 diff --git a/include/linux/namei.h b/include/linux/namei.h
51 index 05b441d..91bc74e 100644
52 --- a/include/linux/namei.h
53 +++ b/include/linux/namei.h
54 @@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
55 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
56 int (*open)(struct inode *, struct file *));
58 +extern struct dentry *lookup_hash(struct nameidata *nd);
59 +extern int __lookup_one_len(const char *name, struct qstr *this,
60 + struct dentry *base, int len);
61 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
63 extern int follow_down(struct path *);
64 diff --git a/include/linux/splice.h b/include/linux/splice.h
65 index 997c3b4..be9a153 100644
66 --- a/include/linux/splice.h
67 +++ b/include/linux/splice.h
68 @@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
69 extern void splice_shrink_spd(struct pipe_inode_info *,
70 struct splice_pipe_desc *);
72 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
73 + loff_t *ppos, size_t len, unsigned int flags);
74 +extern long do_splice_to(struct file *in, loff_t *ppos,
75 + struct pipe_inode_info *pipe, size_t len,
76 + unsigned int flags);
77 +
78 #endif