SOURCES (LINUX_2_6_20): linux-2.6-vs2.3.patch - fix for fs/locks.c

[mguevara]

Author: mguevara                     Date: Tue Jan 16 11:40:14 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- fix for fs/locks.c

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.2.11 -> 1.2.2.12) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.2.11 SOURCES/linux-2.6-vs2.3.patch:1.2.2.12
--- SOURCES/linux-2.6-vs2.3.patch:1.2.2.11	Tue Jan 16 12:27:17 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Tue Jan 16 12:40:09 2007
@@ -7364,7 +7364,7 @@
  {
 +	if (!vx_locks_avail(1))
 +		return NULL;
- 	return kmem_cache_alloc(filelock_cache, SLAB_KERNEL);
+ 	return kmem_cache_alloc(filelock_cache, GFP_KERNEL);
  }
  
 @@ -172,6 +176,7 @@ static void locks_free_lock(struct file_
@@ -7466,8 +7466,8 @@
   */
  int posix_lock_file(struct file *filp, struct file_lock *fl)
  {
--	return __posix_lock_file_conf(filp->f_dentry->d_inode, fl, NULL);
-+	return __posix_lock_file_conf(filp->f_dentry->d_inode,
+-	return __posix_lock_file_conf(filp->f_path.dentry->d_inode, fl, NULL);
++	return __posix_lock_file_conf(filp->f_path.dentry->d_inode,
 +		fl, NULL, filp->f_xid);
  }
  EXPORT_SYMBOL(posix_lock_file);
@@ -7476,8 +7476,8 @@
  int posix_lock_file_conf(struct file *filp, struct file_lock *fl,
  			struct file_lock *conflock)
  {
--	return __posix_lock_file_conf(filp->f_dentry->d_inode, fl, conflock);
-+	return __posix_lock_file_conf(filp->f_dentry->d_inode,
+-	return __posix_lock_file_conf(filp->f_path.dentry->d_inode, fl, conflock);
++	return __posix_lock_file_conf(filp->f_path.dentry->d_inode,
 +		fl, conflock, filp->f_xid);
  }
  EXPORT_SYMBOL(posix_lock_file_conf);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.2.11&r2=1.2.2.12&f=u