The first patch modifies the file /fs/nilfs2/ioctl.c, while NILFS 2.0.12 and current git version have this file located under the path /fs/ioctl.c. Anyway, I have replaced all strings "/fs/nilfs/" with "/fs/", which allowed me to apply the first patch, but the second one and compilation failed:
$ patch -p1 < patch1.patch patching file fs/ioctl.c Hunk #6 succeeded at 572 (offset -2 lines). Hunk #7 succeeded at 606 (offset -2 lines). $ patch -p1 < patch2.patch patching file fs/ioctl.c Hunk #1 FAILED at 25. Hunk #5 FAILED at 432. Hunk #6 succeeded at 448 (offset -2 lines). Hunk #7 succeeded at 469 (offset -2 lines). Hunk #8 succeeded at 478 (offset -2 lines). Hunk #9 succeeded at 486 (offset -2 lines). Hunk #10 succeeded at 506 (offset -2 lines). 2 out of 10 hunks FAILED -- saving rejects to file fs/ioctl.c.rej patching file fs/nilfs.h Hunk #1 succeeded at 245 (offset 9 lines). patching file fs/segment.c Hunk #1 succeeded at 2789 (offset 200 lines). Hunk #2 succeeded at 2807 (offset 200 lines). patching file fs/segment.h $ make -j2 /home/user/temp/nilfs-2.0.12/fs/ioctl.c:434: error: conflicting types for ‘nilfs_ioctl_mark_blocks_dirty’ /home/user/temp/nilfs-2.0.12/fs/ioctl.c:394: error: previous definition of ‘nilfs_ioctl_mark_blocks_dirty’ was here /home/user/temp/nilfs-2.0.12/fs/ioctl.c: In function ‘nilfs_ioctl_mark_blocks_dirty’: /home/user/temp/nilfs-2.0.12/fs/ioctl.c:439: error: ‘nilfs_ioctl_do_mark_blocks_dirty’ undeclared (first use in this function) /home/user/temp/nilfs-2.0.12/fs/ioctl.c:439: error: (Each undeclared identifier is reported only once /home/user/temp/nilfs-2.0.12/fs/ioctl.c:439: error: for each function it appears in.) /home/user/temp/nilfs-2.0.12/fs/ioctl.c: In function ‘nilfs_ioctl_prepare_clean_segments’: /home/user/temp/nilfs-2.0.12/fs/ioctl.c:488: warning: passing argument 3 of ‘nilfs_ioctl_mark_blocks_dirty’ makes integer from pointer without a cast /home/user/temp/nilfs-2.0.12/fs/ioctl.c:496: error: implicit declaration of function ‘nilfs_ioctl_free_segments’ /home/user/temp/nilfs-2.0.12/fs/ioctl.c: In function ‘nilfs_ioctl_clean_segments’: /home/user/temp/nilfs-2.0.12/fs/ioctl.c:544: error: implicit declaration of function ‘memdup_user’ /home/user/temp/nilfs-2.0.12/fs/ioctl.c:545: warning: assignment makes pointer from integer without a cast make[3]: *** [/home/user/temp/nilfs-2.0.12/fs/ioctl.o] Error 1 make[2]: *** [_module_/home/user/temp/nilfs-2.0.12/fs] Error 2 make[2]: Leaving directory `/usr/src/linux-headers-2.6.27-10-generic' make[1]: *** [default] Error 2 make[1]: Leaving directory `/home/user/temp/nilfs-2.0.12/fs' make: *** [fs] Error 2
_______________________________________________ users mailing list [email protected] https://www.nilfs.org/mailman/listinfo/users
