move sources into etercifs rmp package

etercifs.spec

@@ -63,7 +63,7 @@ This package has Etersoft's patches for WINE@Etersoft sharing access support.
 
 %install
 mkdir -p %buildroot%_datadir/%name
-install -m644 buildmodule.sh kernel_src.list etercifs_src.list %buildroot%_datadir/%name
+install -m644 buildmodule.sh kernel_src.list %buildroot%_datadir/%name
 install -m755 distr_vendor %buildroot%_datadir/%name
 sed -e "s|@DATADIR@|%_datadir/%name|g" < functions.sh.init > functions.sh.init.repl
 install -m644 functions.sh.init.repl %buildroot%_datadir/%name/functions.sh
@@ -100,6 +100,7 @@ cp %SOURCE25 %buildroot/%etercifs_src/%src_package_name-2.6.25-%src_2_6_25_versi
 - delete Requires
 - delete Spec part for ALT Linux with BuildRequires
 - Url fixed
+- update sources/2.6.25
 
 * Thu Oct 09 2008 Konstantin Baev <kipruss@altlinux.org> 3.2-alt2
 - remove Requires: rpm-build-compat

etercifs/buildmodule.sh

@@ -12,7 +12,6 @@ MODULEFILENAME=etercifs.ko
 KERNEL=${KERNELVERSION%%-*}
 
 get_src_dir || fatal "Distro $($DISTR_VENDOR -e) is not supported yet for kernel sources"
-get_etercifs_src_dir || fatal "Distro $($DISTR_VENDOR -e) is not supported yet for etercifs sources"
 
 [ -n "`ls $ETERCIFS_SOURCES_LIST`" ] || fatal "Etercifs kernel module sources does not installed!"
 

etercifs/etercifs_src.list

-Generic /usr/src/kernel/sources/kernel-source-etercifs*
-ALTLinux /usr/src/kernel/sources/kernel-source-etercifs*
-Ubuntu /usr/src/kernel/sources/kernel-source-etercifs*
\ No newline at end of file

etercifs/functions.sh.init

@@ -15,19 +15,14 @@ DISTR_VENDOR=@DATADIR@/distr_vendor
 
 test -x $DISTR_VENDOR || fatal "Can't find distr_vendor"
 
+ETERCIFS_SOURCES_LIST=@DATADIR@/sources/kernel-source-etercifs*
+
 get_sd()
 {
     BASE_KERNEL_SOURCES_DIR=
     BASE_KERNEL_SOURCES_DIR=`grep -i $1 kernel_src.list | head -n1 | cut -d" " -f 2 2>/dev/null`
 }
 
-get_etercifs_sd()
-{
-    ETERCIFS_SOURCES_LIST=
-    ETERCIFS_SOURCES_LIST=`grep -i $1 etercifs_src.list | head -n1 | cut -d" " -f 2 2>/dev/null`
-}
-
-
 get_src_dir()
 {
     get_sd `$DISTR_VENDOR -e`
@@ -37,15 +32,6 @@ get_src_dir()
     return 0
 }
 
-get_etercifs_src_dir()
-{
-    get_etercifs_sd `$DISTR_VENDOR -e`
-    [ -z "$ETERCIFS_SOURCES_LIST" ] && get_etercifs_sd `$DISTR_VENDOR -d`
-    [ -z "$ETERCIFS_SOURCES_LIST" ] && { echo "Unknown `$DISTR_VENDOR -d`, use Generic for etercifs sources" ; get_etercifs_sd Generic ; }
-    [ -z "$ETERCIFS_SOURCES_LIST" ] && return 1
-    return 0
-}
-
 exit_handler()
 {
     local rc=$?

sources/2.6.25/cifssmb.c

@@ -1176,8 +1176,10 @@ SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon,
 	int name_len;
 	__u16 count;
 
+#ifndef ETERSOFT_USE_SMB_LEGACY_OPEN
 	printk("Etersoft: Do not use SMBLegacyOpen!\n");
 	return rc;
+#else
 OldOpenRetry:
 	rc = smb_init(SMB_COM_OPEN_ANDX, 15, tcon, (void **) &pSMB,
 		      (void **) &pSMBr);
@@ -1277,6 +1279,7 @@ OldOpenRetry:
 	if (rc == -EAGAIN)
 		goto OldOpenRetry;
 	return rc;
+#endif
 }
 
 int

sources/2.6.25/connect.c

@@ -35,7 +35,6 @@
 #include <linux/freezer.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
-#include <linux/autoconf.h>
 #include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
@@ -1787,15 +1786,13 @@ void reset_cifs_unix_caps(int xid, struct cifsTconInfo *tcon,
 		if (CIFSSMBSetFSUnixInfo(xid, tcon, cap)) {
 			if (vol_info == NULL) {
 				cFYI(1, ("resetting capabilities failed"));
-			}
-			else {
+			} else
 				cERROR(1, ("Negotiating Unix capabilities "
 					   "with the server failed.  Consider "
 					   "mounting with the Unix Extensions\n"
 					   "disabled, if problems are found, "
 					   "by specifying the nounix mount "
 					   "option."));
-			}
 
 		}
 	}

sources/2.6.25/inode.c

@@ -751,7 +751,8 @@ psx_del_no_retry:
 			/* BB could scan to see if we already have it open
 			   and pass in pid of opener to function */
 				rc = CIFSSMBOpen(xid, pTcon, full_path,
-						 FILE_OPEN, SYNCHRONIZE | FILE_WRITE_ATTRIBUTES, FILE_SHARE_ALL, 0,
+						 FILE_OPEN, SYNCHRONIZE |
+						 FILE_WRITE_ATTRIBUTES, FILE_SHARE_ALL, 0,
 						 &netfid, &oplock, NULL,
 						 cifs_sb->local_nls,
 						 cifs_sb->mnt_cifs_flags &
@@ -908,7 +909,6 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
 /*BB check (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID ) to see if need
 	to set uid/gid */
 			inc_nlink(inode);
-//			fc8_inc_nlink(inode);
 			if (pTcon->nocase)
 				direntry->d_op = &cifs_ci_dentry_ops;
 			else
@@ -959,7 +959,6 @@ mkdir_retry_old:
 	} else {
 mkdir_get_info:
 		inc_nlink(inode);
-//		fc8_inc_nlink(inode);
 		if (pTcon->unix_ext)
 			rc = cifs_get_inode_info_unix(&newinode, full_path,
 						      inode->i_sb, xid);
@@ -1270,9 +1269,10 @@ int cifs_revalidate(struct dentry *direntry)
 			/* no need to invalidate inode pages since we were the
 			   only ones who could have modified the file and the
 			   server copy is staler than ours */
-		} else
+		} else {
 			invalidate_inode = TRUE;
 		}
+	}
 
 	/* can not grab this sem since kernel filesys locking documentation
 	   indicates i_mutex may be taken by the kernel on lookup and rename