J. R. Okajima:
Â
Guan, Nikolay,
Please test this patch which tries fixing the problem while previous
patches try finding it.
The necessary things are
- kernel source
- aufs source
- tmpfs-idr.patch
- this patch
The previous debug patches should be all reverted.
One of the patch's hunks failed to be applied:
test-comp linux # patch < 30-latest-fix.patch -p1 -u --verbose
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
|index 1c0912f..71173b3 100644
|--- a/fs/proc/task_mmu.c
|+++ b/fs/proc/task_mmu.c
--------------------------
Patching file fs/proc/task_mmu.c using Plan A...
Hunk #1 succeeded at 270 (offset -7 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
|index d19737f..c4f3b6a 100644
|--- a/fs/proc/task_nommu.c
|+++ b/fs/proc/task_nommu.c
--------------------------
Patching file fs/proc/task_nommu.c using Plan A...
Hunk #1 succeeded at 147 with fuzz 1 (offset -8 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/include/linux/shm.h b/include/linux/shm.h
|index 429c199..2a6af0a 100644
|--- a/include/linux/shm.h
|+++ b/include/linux/shm.h
--------------------------
Patching file include/linux/shm.h using Plan A...
Hunk #1 succeeded at 2.
Hunk #2 succeeded at 46.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/ipc/shm.c b/ipc/shm.c
|index cb858df..a04f630 100644
|--- a/ipc/shm.c
|+++ b/ipc/shm.c
--------------------------
Patching file ipc/shm.c using Plan A...
Hunk #1 FAILED at 455.
Hunk #2 succeeded at 562 (offset 33 lines).
Hunk #3 succeeded at 587 with fuzz 2 (offset 34 lines).
1 out of 3 hunks FAILED -- saving rejects to file ipc/shm.c.rej
done
This is rejected part:
--- ipc/shm.c
+++ ipc/shm.c
@@ -455,6 +455,19 @@
 * Called with shm_ids.rw_mutex held as a writer.
 */
+/* tmpfs */
+static atomic_long_t __shm_file_sb = ATOMIC_LONG_INIT(0);
+
+static struct super_block *shm_file_sb(void)
+{
+Â Â Â Â Â Â return (struct super_block *)atomic_long_read(&__shm_file_sb);
+}
+
+static void shm_file_sb_set(struct super_block *sb)
+{
+Â Â Â Â Â Â atomic_long_set(&__shm_file_sb, (unsigned long)sb);
+}
+
 static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
 {
       key_t key = params->key;
I applied:
aufs3-kbuild.patch (applied by system)
aufs3-base.patch (applied by system)
aufs3-mmap.patch (applied by system)
tmpfs-idr.patch (applied manually)
And then I applied new patch and this resulted in 1 hunk failing.
This place -
[1]http://sourceforge.net/p/aufs/aufs3-linux/ci/aufs3.14/tree/ipc/shm.c#l463
is where it fails
And it looks similar to version 3.12
([2]http://sourceforge.net/p/aufs/aufs3-linux/ci/aufs3.12/tree/ipc/shm.c#l46
0)
So there is something else wrong I guess.
--
Use GNU/Linux
References
1. http://sourceforge.net/p/aufs/aufs3-linux/ci/aufs3.14/tree/ipc/shm.c#l463
2. http://sourceforge.net/p/aufs/aufs3-linux/ci/aufs3.12/tree/ipc/shm.c#l460
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
