diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-02 17:18:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-02 17:18:15 -0300 |
| commit | 512185cd390f9d76d11210105ea00a21b5a50262 (patch) | |
| tree | 1a215db44b58ec9fd497b10020f0c50c43a4b929 /kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch | |
| parent | ee7c176bc22d8c4a4a7785ff8b5176336c06efef (diff) | |
| parent | d9bd53bfca2ce6b66822017248a16232c2f218a8 (diff) | |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch')
| -rw-r--r-- | kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch index ac30c8db9..99a63d024 100644 --- a/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch +++ b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch @@ -1,10 +1,10 @@ -aufs3.2 base patch +aufs3.3 base patch diff --git a/fs/namei.c b/fs/namei.c -index 5008f01..4cc94cf 100644 +index 46ea9cc..f2dcf8d 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name, +@@ -1781,7 +1781,7 @@ static struct dentry *__lookup_hash(struct qstr *name, * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -14,10 +14,10 @@ index 5008f01..4cc94cf 100644 return __lookup_hash(&nd->last, nd->path.dentry, nd); } diff --git a/fs/splice.c b/fs/splice.c -index fa2defa..e3569b0 100644 +index 1ec0493..c599f73 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); +@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ @@ -28,7 +28,7 @@ index fa2defa..e3569b0 100644 { 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, +@@ -1112,9 +1112,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. */ |