Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 179085 | Differences between
and this patch

Collapse All | Expand All

(-)/var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c (-1 / +2 lines)
Lines 781-787 Link Here
781
781
782
	if (cmd == F_GETLK) {
782
	if (cmd == F_GETLK) {
783
		if (fc->no_lock) {
783
		if (fc->no_lock) {
784
#ifdef KERNEL_2_6_17_PLUS
784
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) && \
785
		LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
785
			if (!posix_test_lock(file, fl, fl))
786
			if (!posix_test_lock(file, fl, fl))
786
				fl->fl_type = F_UNLCK;
787
				fl->fl_type = F_UNLCK;
787
#else
788
#else
(-)/var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c (+13 lines)
Lines 809-817 Link Here
809
{
809
{
810
	struct inode * inode = foo;
810
	struct inode * inode = foo;
811
811
812
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
813
	if ((flags & (SLAB_CTOR_CONSTRUCTOR)) == SLAB_CTOR_CONSTRUCTOR)
814
		inode_init_once(inode);
815
#else
812
	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
816
	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
813
	    SLAB_CTOR_CONSTRUCTOR)
817
	    SLAB_CTOR_CONSTRUCTOR)
814
		inode_init_once(inode);
818
		inode_init_once(inode);
819
#endif
815
}
820
}
816
821
817
static int __init fuse_fs_init(void)
822
static int __init fuse_fs_init(void)
Lines 860-871 Link Here
860
	if (err)
865
	if (err)
861
		return err;
866
		return err;
862
#endif
867
#endif
868
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
869
	kobj_set_kset_s(&fuse_subsys, fs_subsys);
870
#else
863
	kset_set_kset_s(&fuse_subsys, fs_subsys);
871
	kset_set_kset_s(&fuse_subsys, fs_subsys);
872
#endif
864
	err = subsystem_register(&fuse_subsys);
873
	err = subsystem_register(&fuse_subsys);
865
	if (err)
874
	if (err)
866
		goto out_err;
875
		goto out_err;
867
876
877
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
878
	kobj_set_kset_s(&fuse_subsys, fs_subsys);
879
#else
868
	kset_set_kset_s(&connections_subsys, fuse_subsys);
880
	kset_set_kset_s(&connections_subsys, fuse_subsys);
881
#endif
869
	err = subsystem_register(&connections_subsys);
882
	err = subsystem_register(&connections_subsys);
870
	if (err)
883
	if (err)
871
		goto out_fuse_unregister;
884
		goto out_fuse_unregister;

Return to bug 179085