View | Details | Raw Unified
Collapse All | Expand All

(-) /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c (-1 / +14 lines)
 Lines 781-787    Link Here  

        
	if (cmd == F_GETLK) {
	if (cmd == F_GETLK) {

        
		if (fc->no_lock) {
		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))
			if (!posix_test_lock(file, fl, fl))

        
				fl->fl_type = F_UNLCK;
				fl->fl_type = F_UNLCK;

        
#else
#else

  

    

    

       Lines 809-817
       
    
  Link Here 
    

  

        
{
{

        
	struct inode * inode = foo;
	struct inode * inode = foo;

        

            

              
              
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)

            

            

              
              
	inode_init_once(inode);

            

            

              
              
#else

            

        
	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==

        
	    SLAB_CTOR_CONSTRUCTOR)
	    SLAB_CTOR_CONSTRUCTOR)

        
		inode_init_once(inode);
		inode_init_once(inode);

            

              
              
#endif

            

        
}
}

        

        
static int __init fuse_fs_init(void)
static int __init fuse_fs_init(void)

  

    

    

       Lines 860-871
       
    
  Link Here 
    

  

        
	if (err)
	if (err)

        
		return err;
		return err;

        
#endif
#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);
	kset_set_kset_s(&fuse_subsys, fs_subsys);

            

              
              
#endif

            

        
	err = subsystem_register(&fuse_subsys);
	err = subsystem_register(&fuse_subsys);

        
	if (err)
	if (err)

        
		goto out_err;
		goto out_err;

        

            

              
              
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)

            

            

              
              
	kobj_set_kset_s(&connections_subsys, fuse_subsys);

            

            

              
              
#else

            

        
	kset_set_kset_s(&connections_subsys, fuse_subsys);
	kset_set_kset_s(&connections_subsys, fuse_subsys);

            

              
              
#endif

            

        
	err = subsystem_register(&connections_subsys);
	err = subsystem_register(&connections_subsys);

        
	if (err)
	if (err)

        
		goto out_fuse_unregister;
		goto out_fuse_unregister;