Commit aa91c7e4 authored by Suresh Jayaraman's avatar Suresh Jayaraman Committed by Steve French
Browse files

cifs: fix broken oplock handling 



cifs_new_fileinfo() does not use the 'oplock' value from the callers. Instead,
it sets it to REQ_OPLOCK which seems wrong. We should be using the oplock value
obtained from the Server to set the inode's clientCanCacheAll or
clientCanCacheRead flags. Fix this by passing oplock from the callers to
cifs_new_fileinfo().

This change dates back to commit a6ce4932 (2.6.30-rc3). So, all the affected
versions will need this fix. Please Cc stable once reviewed and accepted.

Cc: Stable <stable@kernel.org>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSuresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent a347ecb2

fs/cifs/cifsproto.h

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ extern struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time, 


extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode,

				__u16 fileHandle, struct file *file,

				struct vfsmount *mnt, unsigned int oflags);

				struct vfsmount *mnt, unsigned int oflags,

				__u32 oplock);

extern int cifs_posix_open(char *full_path, struct inode **pinode,

				struct super_block *sb,

				int mode, int oflags,

fs/cifs/dir.c

+5 −7
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ cifs_bp_rename_retry: 


struct cifsFileInfo *

cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle,

		  struct file *file, struct vfsmount *mnt, unsigned int oflags)

		  struct file *file, struct vfsmount *mnt, unsigned int oflags,

		  __u32 oplock)

{

	int oplock = 0;

	struct cifsFileInfo *pCifsFile;

	struct cifsInodeInfo *pCifsInode;

	struct cifs_sb_info *cifs_sb = CIFS_SB(mnt->mnt_sb);
@@ -143,9 +143,6 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, 
	if (pCifsFile == NULL)

		return pCifsFile;



	if (oplockEnabled)

		oplock = REQ_OPLOCK;



	pCifsFile->netfid = fileHandle;

	pCifsFile->pid = current->tgid;

	pCifsFile->pInode = igrab(newinode);
@@ -468,7 +465,7 @@ cifs_create_set_dentry: 
		}



		pfile_info = cifs_new_fileinfo(newinode, fileHandle, filp,

					       nd->path.mnt, oflags);

					       nd->path.mnt, oflags, oplock);

		if (pfile_info == NULL) {

			fput(filp);

			CIFSSMBClose(xid, tcon, fileHandle);
@@ -729,7 +726,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 


			cfile = cifs_new_fileinfo(newInode, fileHandle, filp,

						  nd->path.mnt,

						  nd->intent.open.flags);

						  nd->intent.open.flags,

						  oplock);

			if (cfile == NULL) {

				fput(filp);

				CIFSSMBClose(xid, pTcon, fileHandle);

fs/cifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ int cifs_open(struct inode *inode, struct file *file) 


			pCifsFile = cifs_new_fileinfo(inode, netfid, file,

							file->f_path.mnt,

							oflags);

							oflags, oplock);

			if (pCifsFile == NULL) {

				CIFSSMBClose(xid, tcon, netfid);

				rc = -ENOMEM;
@@ -370,7 +370,7 @@ int cifs_open(struct inode *inode, struct file *file) 
		goto out;



	pCifsFile = cifs_new_fileinfo(inode, netfid, file, file->f_path.mnt,

					file->f_flags);

					file->f_flags, oplock);

	if (pCifsFile == NULL) {

		rc = -ENOMEM;

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE