search

sfjro / aufs-standalone

27 stars 14 forks source link

saving rejects to file fs/file_table.c.rej #14

Closed 01micko closed 2 years ago

01micko commented 2 years ago

https://github.com/sfjro/aufs5-standalone/blob/ffd1e8d4d7a2a67ce7b39b78de0da47815d25fdc/aufs5-standalone.patch#L64

Seems linux already has this line now in 5.15.41

Thank you.

01micko commented 2 years ago

My log from kernel-kit (puppylinux)

Adding Aufs to the kernel sources

patch -N -p1 < aufs5-kbuild.patch
patching file fs/Kconfig
patching file fs/Makefile

patch -N -p1 < aufs5-base.patch
patching file MAINTAINERS
patching file drivers/block/loop.c
patching file fs/dcache.c
patching file fs/fcntl.c
patching file fs/namespace.c
patching file fs/splice.c
patching file include/linux/fs.h
patching file include/linux/lockdep.h
patching file include/linux/mnt_namespace.h
patching file include/linux/splice.h
patching file kernel/locking/lockdep.c

patch -N -p1 < aufs5-standalone.patch
patching file fs/dcache.c
patching file fs/exec.c
patching file fs/fcntl.c
patching file fs/file_table.c
Hunk #2 FAILED at 376.
1 out of 2 hunks FAILED -- saving rejects to file fs/file_table.c.rej
patching file fs/namespace.c
patching file fs/notify/group.c
patching file fs/open.c
patching file fs/read_write.c
patching file fs/splice.c
patching file fs/xattr.c
patching file kernel/locking/lockdep.c
patching file kernel/task_work.c
patching file security/security.c
WARNING: failed to add some Aufs patches to the kernel sources.
Check it manually and either CRTL+C to bail or hit enter to go on

patch -N -p1 < aufs5-mmap.patch
patching file fs/proc/base.c
patching file fs/proc/nommu.c
patching file fs/proc/task_mmu.c
patching file fs/proc/task_nommu.c
patching file include/linux/mm.h
patching file include/linux/mm_types.h
patching file kernel/fork.c
patching file mm/Makefile
patching file mm/filemap.c
patching file mm/mmap.c
patching file mm/nommu.c
patching file mm/prfile.c

I checked and went on.

sfjro commented 2 years ago

Hello Mick,

Mick Amadio:

https://github.com/sfjro/aufs5-standalone/blob/ffd1e8d4d7a2a67ce7b39b78de0da47815d25fdc/aufs5-standalone.patch#L64

Seems linux already has this line now in 5.15.41

Thanks for the report. Now I've confirmed that the commit in v5.18-rc2 f00432063db1 2022-04-07 SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()

was backported to v5.15.41 as 54f6834b283d 2022-05-18 SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()

I will make and release a new branch for v5.15.41. Hopefully it will be released on next Monday. For now, as you already know, you can simply remove the part

+EXPORT_SYMBOL_GPL(__fput_sync);

from the patch.

J. R. Okajima

01micko commented 2 years ago

Thank you Junjiro (I hope I got that right!)

I'll close this as next Monday is good enough for me.

sfjro commented 2 years ago

------- Blind-Carbon-Copy

From: "J. R. Okajima" @.> To: @. Subject: aufs5 GIT release (v5.15.41 and v5.18) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: @.> Date: Mon, 30 May 2022 00:50:08 +0900 Message-ID: @.>

o news

misc

J. R. Okajima

------- End of Blind-Carbon-Copy