Author: sfrench Date: 2007-02-07 07:25:18 +0000 (Wed, 07 Feb 2007) New Revision: 99
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=99 Log: Fix minor build break Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c Changeset: Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c =================================================================== --- branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c 2007-02-07 07:12:17 UTC (rev 98) +++ branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c 2007-02-07 07:25:18 UTC (rev 99) @@ -33,9 +33,6 @@ #include <linux/vfs.h> #include <linux/mempool.h> #include <linux/delay.h> -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) -#include <linux/freezer.h> -#endif /* 2.6.19 */ #include "cifsfs.h" #include "cifspdu.h" #define DECLARE_GLOBALS_HERE @@ -46,8 +43,11 @@ #include <linux/mm.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) #include <linux/moduleparam.h> -#endif -#define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ +#endif /* 2.6.9 */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) +#include <linux/freezer.h> +#endif /* 2.6.19 */ +#define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ #ifdef CONFIG_CIFS_QUOTA static struct quotactl_ops cifs_quotactl_ops; @@ -572,10 +572,16 @@ /* some applications poll for the file length in this strange way so we must seek to end on non-oplocked files by setting the revalidate time to zero */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 19) if(file->f_path.dentry->d_inode) CIFS_I(file->f_path.dentry->d_inode)->time = 0; retval = cifs_revalidate(file->f_path.dentry); +#else + if(file->f_dentry->d_inode) + CIFS_I(file->f_dentry->d_inode)->time = 0; + retval = cifs_revalidate(file->f_dentry); +#endif if (retval < 0) return (loff_t)retval; }