Author: sfrench Date: 2006-08-22 22:01:16 +0000 (Tue, 22 Aug 2006) New Revision: 80
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=80 Log: Nearly done cifs ifdefs for 2.4 kernel Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsglob.h branches/linux-converged-for-old-kernels/fs/cifs/file.c Changeset: Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsglob.h =================================================================== --- branches/linux-converged-for-old-kernels/fs/cifs/cifsglob.h 2006-08-22 17:23:48 UTC (rev 79) +++ branches/linux-converged-for-old-kernels/fs/cifs/cifsglob.h 2006-08-22 22:01:16 UTC (rev 80) @@ -332,7 +332,9 @@ unsigned clientCanCacheRead:1; /* read oplock */ unsigned clientCanCacheAll:1; /* read and writebehind oplock */ unsigned oplockPending:1; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0) struct inode vfs_inode; +#endif }; #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0) Modified: branches/linux-converged-for-old-kernels/fs/cifs/file.c =================================================================== --- branches/linux-converged-for-old-kernels/fs/cifs/file.c 2006-08-22 17:23:48 UTC (rev 79) +++ branches/linux-converged-for-old-kernels/fs/cifs/file.c 2006-08-22 22:01:16 UTC (rev 80) @@ -35,6 +35,7 @@ #include <linux/pagevec.h> #include <linux/writeback.h> #endif +#include <asm/uaccess.h> #ifndef FL_SLEEP #define FL_SLEEP 0 #endif @@ -1071,7 +1072,7 @@ read_unlock(&GlobalSMBSeslock); if((open_file->invalidHandle) && (!open_file->closePend) /* BB fixme -since the second clause can not be true remove it BB */) { - rc = cifs_reopen_file(&cifs_inode->vfs_inode, + rc = cifs_reopen_file(open_file->pfile->f_dentry->d_inode, open_file->pfile, FALSE); /* if it fails, try another handle - might be */ /* dangerous to hold up writepages with retry */ @@ -1988,7 +1989,7 @@ be closable if needed */ atomic_dec(&open_file->wrtPending); - cifs_sb = CIFS_SB(cifsInode->vfs_inode.i_sb); + cifs_sb = CIFS_SB(open_file->pfile->f_dentry->d_inode->i_sb); if ( cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO ) { /* since no page cache to corrupt on directio we can change size safely */