Author: sfrench Date: 2006-09-17 23:45:49 +0000 (Sun, 17 Sep 2006) New Revision: 82
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=82 Log: More 2.4 build fixes from Yehuda Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c branches/linux-converged-for-old-kernels/fs/cifs/transport.c Changeset: Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c =================================================================== --- branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c 2006-09-14 21:20:14 UTC (rev 81) +++ branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c 2006-09-17 23:45:49 UTC (rev 82) @@ -40,7 +40,9 @@ #include "cifs_debug.h" #include "cifs_fs_sb.h" #include <linux/mm.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)) #include <linux/moduleparam.h> +#endif #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ #ifdef CONFIG_CIFS_QUOTA @@ -63,16 +65,16 @@ extern struct task_struct * dnotifyThread; /* remove sparse warning */ struct task_struct * dnotifyThread = NULL; unsigned int CIFSMaxBufSize = CIFS_MAX_MSGSIZE; -module_param(CIFSMaxBufSize, int, 0); +MODULE_PARM(CIFSMaxBufSize, "i"); MODULE_PARM_DESC(CIFSMaxBufSize,"Network buffer size (not including header). Default: 16384 Range: 8192 to 130048"); unsigned int cifs_min_rcv = CIFS_MIN_RCV_POOL; -module_param(cifs_min_rcv, int, 0); +MODULE_PARM(cifs_min_rcv, "i"); MODULE_PARM_DESC(cifs_min_rcv,"Network buffers in pool. Default: 4 Range: 1 to 64"); unsigned int cifs_min_small = 30; -module_param(cifs_min_small, int, 0); +MODULE_PARM(cifs_min_small, "i"); MODULE_PARM_DESC(cifs_min_small,"Small network buffers in pool. Default: 30 Range: 2 to 256"); unsigned int cifs_max_pending = CIFS_MAX_REQ; -module_param(cifs_max_pending, int, 0); +MODULE_PARM(cifs_max_pending, "i"); MODULE_PARM_DESC(cifs_max_pending,"Simultaneous requests to server. Default: 50 Range: 2 to 256"); static DECLARE_COMPLETION(cifs_oplock_exited); Modified: branches/linux-converged-for-old-kernels/fs/cifs/transport.c =================================================================== --- branches/linux-converged-for-old-kernels/fs/cifs/transport.c 2006-09-14 21:20:14 UTC (rev 81) +++ branches/linux-converged-for-old-kernels/fs/cifs/transport.c 2006-09-17 23:45:49 UTC (rev 82) @@ -314,7 +314,10 @@ break; if (rc >= total_len) { - WARN_ON(rc > total_len); + if(rc > total_len) { + cERROR(1,("unexpected length received")); + dump_stack(); + } break; } if(rc == 0) {
