179085 2007-05-19 11:08 0000 sys-fs/fuse-2.6.4-r1 compilation fails with 2.6.22 2007-05-20 07:45:03 0000 1 1 1 Unclassified Gentoo Linux Core system 2007.0 x86 Linux RESOLVED FIXED P2 normal --- 1 belgix@kern.com.au genstef@gentoo.org kernel-misc@gentoo.org belgix@kern.com.au 2007-05-19 11:08:30 0000 With recent changes in Linux kernel sys-fs/fuse refuse to compile. Here is a start to make a patch. Works fine and tested with sys-fs/ntfs3g-1.516 on vanilla-sources-2.6.22-rc1. --- /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c 2007-05-19 19:54:45.000000000 +0930 +++ /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c 2007-05-19 19:58:40.000000000 +0930 @@ -781,7 +781,8 @@ if (cmd == F_GETLK) { if (fc->no_lock) { -#ifdef KERNEL_2_6_17_PLUS +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) && \ + LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) if (!posix_test_lock(file, fl, fl)) fl->fl_type = F_UNLCK; #else --- /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c 2007-05-19 20:04:35.000000000 +0930 +++ /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c 2007-05-19 20:20:14.000000000 +0930 @@ -809,9 +809,14 @@ { struct inode * inode = foo; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + if ((flags & (SLAB_CTOR_CONSTRUCTOR)) == SLAB_CTOR_CONSTRUCTOR) + inode_init_once(inode); +#else if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == SLAB_CTOR_CONSTRUCTOR) inode_init_once(inode); +#endif } static int __init fuse_fs_init(void) @@ -860,12 +865,20 @@ if (err) return err; #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + kobj_set_kset_s(&fuse_subsys, fs_subsys); +#else kset_set_kset_s(&fuse_subsys, fs_subsys); +#endif err = subsystem_register(&fuse_subsys); if (err) goto out_err; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + kobj_set_kset_s(&fuse_subsys, fs_subsys); +#else kset_set_kset_s(&connections_subsys, fuse_subsys); +#endif err = subsystem_register(&connections_subsys); if (err) goto out_fuse_unregister; jakub@gentoo.org 2007-05-19 11:17:01 0000 Please, don't paste patches inline. belgix@kern.com.au 2007-05-19 12:04:10 0000 Created an attachment (id=119687) Patch to fix fuse-2.6.4-r1 ebuild Sorry. Here is again. belgix@kern.com.au 2007-05-19 23:56:57 0000 Created an attachment (id=119757) Updated patch for 2.6.22-rc2 genstef@gentoo.org 2007-05-20 07:45:03 0000 thank you, I committed this! 119687 2007-05-19 12:04 0000 Patch to fix fuse-2.6.4-r1 ebuild fuse-2.6.4-r1.diff text/plain LS0tIC92YXIvdG1wL3BvcnRhZ2Uvc3lzLWZzL2Z1c2UtMi42LjQtcjEvd29yay9mdXNlLTIuNi40 L2tlcm5lbC9maWxlLmMJMjAwNy0wNS0xOSAxOTo1NDo0NS4wMDAwMDAwMDAgKzA5MzAKKysrIC92 YXIvdG1wL3BvcnRhZ2Uvc3lzLWZzL2Z1c2UtMi42LjQtcjEvd29yay9mdXNlLTIuNi40L2tlcm5l bC9maWxlLmMJMjAwNy0wNS0xOSAxOTo1ODo0MC4wMDAwMDAwMDAgKzA5MzAKQEAgLTc4MSw3ICs3 ODEsOCBAQAogCiAJaWYgKGNtZCA9PSBGX0dFVExLKSB7CiAJCWlmIChmYy0+bm9fbG9jaykgewot I2lmZGVmIEtFUk5FTF8yXzZfMTdfUExVUworI2lmIExJTlVYX1ZFUlNJT05fQ09ERSA+PSBLRVJO RUxfVkVSU0lPTigyLCA2LCAxNykgJiYgXAorCQlMSU5VWF9WRVJTSU9OX0NPREUgPCBLRVJORUxf VkVSU0lPTigyLCA2LCAyMikKIAkJCWlmICghcG9zaXhfdGVzdF9sb2NrKGZpbGUsIGZsLCBmbCkp CiAJCQkJZmwtPmZsX3R5cGUgPSBGX1VOTENLOwogI2Vsc2UKLS0tIC92YXIvdG1wL3BvcnRhZ2Uv c3lzLWZzL2Z1c2UtMi42LjQtcjEvd29yay9mdXNlLTIuNi40L2tlcm5lbC9pbm9kZS5jCTIwMDct MDUtMTkgMjA6MDQ6MzUuMDAwMDAwMDAwICswOTMwCisrKyAvdmFyL3RtcC9wb3J0YWdlL3N5cy1m cy9mdXNlLTIuNi40LXIxL3dvcmsvZnVzZS0yLjYuNC9rZXJuZWwvaW5vZGUuYwkyMDA3LTA1LTE5 IDIwOjIwOjE0LjAwMDAwMDAwMCArMDkzMApAQCAtODA5LDkgKzgwOSwxNCBAQAogewogCXN0cnVj dCBpbm9kZSAqIGlub2RlID0gZm9vOwogCisjaWYgTElOVVhfVkVSU0lPTl9DT0RFID49IEtFUk5F TF9WRVJTSU9OKDIsIDYsIDIyKQorCWlmICgoZmxhZ3MgJiAoU0xBQl9DVE9SX0NPTlNUUlVDVE9S KSkgPT0gU0xBQl9DVE9SX0NPTlNUUlVDVE9SKQorCQlpbm9kZV9pbml0X29uY2UoaW5vZGUpOwor I2Vsc2UKIAlpZiAoKGZsYWdzICYgKFNMQUJfQ1RPUl9WRVJJRll8U0xBQl9DVE9SX0NPTlNUUlVD VE9SKSkgPT0KIAkgICAgU0xBQl9DVE9SX0NPTlNUUlVDVE9SKQogCQlpbm9kZV9pbml0X29uY2Uo aW5vZGUpOworI2VuZGlmCiB9CiAKIHN0YXRpYyBpbnQgX19pbml0IGZ1c2VfZnNfaW5pdCh2b2lk KQpAQCAtODYwLDEyICs4NjUsMjAgQEAKIAlpZiAoZXJyKQogCQlyZXR1cm4gZXJyOwogI2VuZGlm CisjaWYgTElOVVhfVkVSU0lPTl9DT0RFID49IEtFUk5FTF9WRVJTSU9OKDIsIDYsIDIyKQorCWtv Ympfc2V0X2tzZXRfcygmZnVzZV9zdWJzeXMsIGZzX3N1YnN5cyk7CisjZWxzZQogCWtzZXRfc2V0 X2tzZXRfcygmZnVzZV9zdWJzeXMsIGZzX3N1YnN5cyk7CisjZW5kaWYKIAllcnIgPSBzdWJzeXN0 ZW1fcmVnaXN0ZXIoJmZ1c2Vfc3Vic3lzKTsKIAlpZiAoZXJyKQogCQlnb3RvIG91dF9lcnI7CiAK KyNpZiBMSU5VWF9WRVJTSU9OX0NPREUgPj0gS0VSTkVMX1ZFUlNJT04oMiwgNiwgMjIpCisJa29i al9zZXRfa3NldF9zKCZmdXNlX3N1YnN5cywgZnNfc3Vic3lzKTsKKyNlbHNlCiAJa3NldF9zZXRf a3NldF9zKCZjb25uZWN0aW9uc19zdWJzeXMsIGZ1c2Vfc3Vic3lzKTsKKyNlbmRpZgogCWVyciA9 IHN1YnN5c3RlbV9yZWdpc3RlcigmY29ubmVjdGlvbnNfc3Vic3lzKTsKIAlpZiAoZXJyKQogCQln b3RvIG91dF9mdXNlX3VucmVnaXN0ZXI7Cg== 119757 2007-05-19 23:56 0000 Updated patch for 2.6.22-rc2 fuse-2.6.4-r1.diff text/plain LS0tIC92YXIvdG1wL3BvcnRhZ2Uvc3lzLWZzL2Z1c2UtMi42LjQtcjEvd29yay9mdXNlLTIuNi40 L2tlcm5lbC9maWxlLmMJMjAwNy0wNS0xOSAxOTo1NDo0NS4wMDAwMDAwMDAgKzA5MzAKKysrIC92 YXIvdG1wL3BvcnRhZ2Uvc3lzLWZzL2Z1c2UtMi42LjQtcjEvd29yay9mdXNlLTIuNi40L2tlcm5l bC9maWxlLmMJMjAwNy0wNS0xOSAxOTo1ODo0MC4wMDAwMDAwMDAgKzA5MzAKQEAgLTc4MSw3ICs3 ODEsOCBAQAogCiAJaWYgKGNtZCA9PSBGX0dFVExLKSB7CiAJCWlmIChmYy0+bm9fbG9jaykgewot I2lmZGVmIEtFUk5FTF8yXzZfMTdfUExVUworI2lmIExJTlVYX1ZFUlNJT05fQ09ERSA+PSBLRVJO RUxfVkVSU0lPTigyLCA2LCAxNykgJiYgXAorCQlMSU5VWF9WRVJTSU9OX0NPREUgPCBLRVJORUxf VkVSU0lPTigyLCA2LCAyMikKIAkJCWlmICghcG9zaXhfdGVzdF9sb2NrKGZpbGUsIGZsLCBmbCkp CiAJCQkJZmwtPmZsX3R5cGUgPSBGX1VOTENLOwogI2Vsc2UKLS0tIC92YXIvdG1wL3BvcnRhZ2Uv c3lzLWZzL2Z1c2UtMi42LjQtcjEvd29yay9mdXNlLTIuNi40L2tlcm5lbC9pbm9kZS5jCTIwMDct MDUtMjAgMDk6MTM6MzQuMDAwMDAwMDAwICswOTMwCisrKyAvdmFyL3RtcC9wb3J0YWdlL3N5cy1m cy9mdXNlLTIuNi40LXIxL3dvcmsvZnVzZS0yLjYuNC9rZXJuZWwvaW5vZGUuYwkyMDA3LTA1LTIw IDA5OjE4OjMzLjAwMDAwMDAwMCArMDkzMApAQCAtODA5LDkgKzgwOSwxMyBAQAogewogCXN0cnVj dCBpbm9kZSAqIGlub2RlID0gZm9vOwogCisjaWYgTElOVVhfVkVSU0lPTl9DT0RFID49IEtFUk5F TF9WRVJTSU9OKDIsIDYsIDIyKQorCWlub2RlX2luaXRfb25jZShpbm9kZSk7CisjZWxzZQogCWlm ICgoZmxhZ3MgJiAoU0xBQl9DVE9SX1ZFUklGWXxTTEFCX0NUT1JfQ09OU1RSVUNUT1IpKSA9PQog CSAgICBTTEFCX0NUT1JfQ09OU1RSVUNUT1IpCiAJCWlub2RlX2luaXRfb25jZShpbm9kZSk7Cisj ZW5kaWYKIH0KIAogc3RhdGljIGludCBfX2luaXQgZnVzZV9mc19pbml0KHZvaWQpCkBAIC04NjAs MTIgKzg2NCwyMCBAQAogCWlmIChlcnIpCiAJCXJldHVybiBlcnI7CiAjZW5kaWYKKyNpZiBMSU5V WF9WRVJTSU9OX0NPREUgPj0gS0VSTkVMX1ZFUlNJT04oMiwgNiwgMjIpCisJa29ial9zZXRfa3Nl dF9zKCZmdXNlX3N1YnN5cywgZnNfc3Vic3lzKTsKKyNlbHNlCiAJa3NldF9zZXRfa3NldF9zKCZm dXNlX3N1YnN5cywgZnNfc3Vic3lzKTsKKyNlbmRpZgogCWVyciA9IHN1YnN5c3RlbV9yZWdpc3Rl cigmZnVzZV9zdWJzeXMpOwogCWlmIChlcnIpCiAJCWdvdG8gb3V0X2VycjsKIAorI2lmIExJTlVY X1ZFUlNJT05fQ09ERSA+PSBLRVJORUxfVkVSU0lPTigyLCA2LCAyMikKKwlrb2JqX3NldF9rc2V0 X3MoJmNvbm5lY3Rpb25zX3N1YnN5cywgZnVzZV9zdWJzeXMpOworI2Vsc2UKIAlrc2V0X3NldF9r c2V0X3MoJmNvbm5lY3Rpb25zX3N1YnN5cywgZnVzZV9zdWJzeXMpOworI2VuZGlmCiAJZXJyID0g c3Vic3lzdGVtX3JlZ2lzdGVyKCZjb25uZWN0aW9uc19zdWJzeXMpOwogCWlmIChlcnIpCiAJCWdv dG8gb3V0X2Z1c2VfdW5yZWdpc3RlcjsK