View | Details | Raw Unified
Collapse All | Expand All

(-) cluster-1.04.00.orig/gfs-kernel/src/gfs/ops_file.c (-5 / +4 lines)
 Lines 1465-1477    Link Here  

        
	if (sdp->sd_args.ar_localflocks) {
	if (sdp->sd_args.ar_localflocks) {

        
		if (IS_GETLK(cmd)) {
		if (IS_GETLK(cmd)) {

            

              
			struct file_lock tmp;

              
			struct file_lock *tmp;

            

            

              
			int ret;

              

            

        
			lock_kernel();
			lock_kernel();

            

              
			ret = posix_test_lock(file, fl, &tmp);

              
			tmp = posix_test_lock(file, fl);

            

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

            

              
			if (ret)

              
			if (tmp)

            

            

              
				memcpy(fl, &tmp, sizeof(struct file_lock));

              
				memcpy(fl, tmp, sizeof(struct file_lock));

            

        
			unlock_kernel();
			unlock_kernel();

        
		        return 0;
		        return 0;

        
		} else {
		} else {



(-) cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c
      (-5 / +4 lines)




  

    

    

       Lines 243-256
       
    
  Link Here 
    

  

        
		 struct lm_lockname *name,
		 struct lm_lockname *name,

        
		 struct file *file, struct file_lock *fl)
		 struct file *file, struct file_lock *fl)

        
{
{

            

              
	struct file_lock tmp;

              
	struct file_lock *tmp;

            

            

              
	int ret;

              

            

        

        
	lock_kernel();
	lock_kernel();

            

              
	ret = posix_test_lock(file, fl, &tmp);

              
	tmp = posix_test_lock(file, fl);

            

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

            

              
	if (ret)

              
	if (tmp)

            

            

              
		memcpy(fl, &tmp, sizeof(struct file_lock));

              
		memcpy(fl, tmp, sizeof(struct file_lock));

            

        
	unlock_kernel();
	unlock_kernel();

        

        
	return 0;
	return 0;