packages: kernel/kernel-small_fixes.patch - trying to fix unionfs build

[arekm]

Author: arekm                        Date: Tue May 29 19:24:55 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- trying to fix unionfs build

---- Files affected:
packages/kernel:
   kernel-small_fixes.patch (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.61 packages/kernel/kernel-small_fixes.patch:1.62
--- packages/kernel/kernel-small_fixes.patch:1.61	Mon May 21 11:14:57 2012
+++ packages/kernel/kernel-small_fixes.patch	Tue May 29 21:24:50 2012
@@ -50,3 +50,30 @@
 1.7.7.3
 
   
+--- linux-3.4/fs/unionfs/commonfops.c.org	2012-05-29 20:40:20.756489877 +0200
++++ linux-3.4/fs/unionfs/commonfops.c	2012-05-29 21:07:12.021252743 +0200
+@@ -766,7 +766,7 @@
+ 				   unsigned int cmd, unsigned long arg)
+ {
+ 	int err = 0;
+-	fd_set branchlist;
++	unsigned long branchlist = 0;
+ 	int bstart = 0, bend = 0, bindex = 0;
+ 	int orig_bstart, orig_bend;
+ 	struct dentry *dentry, *lower_dentry;
+@@ -781,14 +781,12 @@
+ 	bstart = dbstart(dentry);
+ 	bend = dbend(dentry);
+ 
+-	FD_ZERO(&branchlist);
+-
+ 	for (bindex = bstart; bindex <= bend; bindex++) {
+ 		lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
+ 		if (!lower_dentry)
+ 			continue;
+ 		if (likely(lower_dentry->d_inode))
+-			FD_SET(bindex, &branchlist);
++			__set_bit(bindex, &branchlist);
+ 		/* purge any lower objects after partial_lookup */
+ 		if (bindex < orig_bstart || bindex > orig_bend) {
+ 			dput(lower_dentry);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/kernel/kernel-small_fixes.patch?r1=1.61&r2=1.62