Author: zbyniu Date: Wed May 7 23:31:43 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.25
---- Files affected:
SOURCES:
kernel-unionfs-vserver.patch (1.1.2.4 -> 1.1.2.5)
---- Diffs:
================================================================
Index: SOURCES/kernel-unionfs-vserver.patch
diff -u SOURCES/kernel-unionfs-vserver.patch:1.1.2.4
SOURCES/kernel-unionfs-vserver.patch:1.1.2.5
--- SOURCES/kernel-unionfs-vserver.patch:1.1.2.4 Fri Jan 18 22:20:37 2008
+++ SOURCES/kernel-unionfs-vserver.patch Thu May 8 01:31:38 2008
@@ -38,13 +38,13 @@
--- a/fs/unionfs/inode.c 2007-09-20 16:19:41.996647500 +0200
+++ b/fs/unionfs/inode.c 2007-09-20 16:25:09.241099000 +0200
@@ -89,7 +89,7 @@
- lower_dir_dentry = lock_parent_wh(wh_dentry);
- /* see Documentation/filesystems/unionfs/issues.txt */
- lockdep_off();
-- err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
-+ err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry,
NULL);
- lockdep_on();
- unlock_dir(lower_dir_dentry);
+ lower_dir_dentry = lock_parent_wh(wh_dentry);
+ /* see Documentation/filesystems/unionfs/issues.txt */
+ lockdep_off();
+- err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
++ err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry, NULL);
+ lockdep_on();
+ unlock_dir(lower_dir_dentry);
@@ -282,7 +282,7 @@
/* see Documentation/filesystems/unionfs/issues.txt */
@@ -73,15 +73,6 @@
lockdep_on();
unlock_dir(lower_dir_dentry);
goto check_link;
-@@ -458,7 +458,7 @@
- struct dentry *lower_dir_dentry;
-
- lower_dir_dentry = lock_parent_wh(wh_dentry);
-- err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
-+ err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry,
NULL);
- unlock_dir(lower_dir_dentry);
-
- /*
@@ -505,7 +505,7 @@
mode = S_IALLUGO;
@@ -100,15 +91,6 @@
unlock_dir(lower_parent_dentry);
-@@ -754,7 +754,7 @@
- struct dentry *lower_dir_dentry;
-
- lower_dir_dentry = lock_parent_wh(wh_dentry);
-- err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
-+ err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry,
NULL);
- unlock_dir(lower_dir_dentry);
-
- /*
@@ -799,7 +799,7 @@
goto out;
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-unionfs-vserver.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
