Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa9bbe0 authored by Steve French's avatar Steve French
Browse files

[CIFS] remove unused variables 



CC: Jeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent cbff2904

fs/cifs/cifsglob.h

+1 −2
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ struct cifsFileInfo { 
	bool messageMode:1;	/* for pipes: message vs byte mode */

	atomic_t wrtPending;   /* handle in use - defer close */

	struct semaphore fh_sem; /* prevents reopen race after dead ses*/

	char *search_resume_name; /* BB removeme BB */

	struct cifs_search_info srch_inf;

};
@@ -626,7 +625,7 @@ GLOBAL_EXTERN atomic_t tcpSesAllocCount; 
GLOBAL_EXTERN atomic_t tcpSesReconnectCount;

GLOBAL_EXTERN atomic_t tconInfoReconnectCount;



/* Various Debug counters to remove someday (BB) */

/* Various Debug counters */

GLOBAL_EXTERN atomic_t bufAllocCount;    /* current number allocated  */

#ifdef CONFIG_CIFS_STATS2

GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */

fs/cifs/cifssmb.c

+2 −4
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, 
{

	int rc = 0;

	LOCK_REQ *pSMB = NULL;

	LOCK_RSP *pSMBr = NULL;

/*	LOCK_RSP *pSMBr = NULL; */ /* No response data other than rc to parse */

	int bytes_returned;

	int timeout = 0;

	__u16 count;
@@ -1739,8 +1739,6 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, 
	if (rc)

		return rc;



	pSMBr = (LOCK_RSP *)pSMB; /* BB removeme BB */



	if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) {

		timeout = CIFS_ASYNC_OP; /* no response expected */

		pSMB->Timeout = 0;
@@ -1774,7 +1772,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, 


	if (waitFlag) {

		rc = SendReceiveBlockingLock(xid, tcon, (struct smb_hdr *) pSMB,

			(struct smb_hdr *) pSMBr, &bytes_returned);

			(struct smb_hdr *) pSMB, &bytes_returned);

		cifs_small_buf_release(pSMB);

	} else {

		rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *)pSMB,

fs/cifs/file.c

+0 −7
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ int cifs_close(struct inode *inode, struct file *file) 
			msleep(timeout);

			timeout *= 8;

		}

		kfree(pSMBFile->search_resume_name);

		kfree(file->private_data);

		file->private_data = NULL;

	} else
@@ -605,12 +604,6 @@ int cifs_closedir(struct inode *inode, struct file *file) 
			else

				cifs_buf_release(ptmp);

		}

		ptmp = pCFileStruct->search_resume_name;

		if (ptmp) {

			cFYI(1, ("closedir free resume name"));

			pCFileStruct->search_resume_name = NULL;

			kfree(ptmp);

		}

		kfree(file->private_data);

		file->private_data = NULL;

	}

fs/cifs/misc.c

+1 −2
Original line number Diff line number Diff line
@@ -519,8 +519,7 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv) 
			pnotify = (struct file_notify_information *)

				((char *)&pSMBr->hdr.Protocol + data_offset);

			cFYI(1, ("dnotify on %s Action: 0x%x",

				 pnotify->FileName,

				pnotify->Action));  /* BB removeme BB */

				 pnotify->FileName, pnotify->Action));

			/*   cifs_dump_mem("Rcvd notify Data: ",buf,

				sizeof(struct smb_hdr)+60); */

			return true;

fs/cifs/readdir.c

+1 −5
Original line number Diff line number Diff line
@@ -675,8 +675,6 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, 
			cifsFile->invalidHandle = true;

			CIFSFindClose(xid, pTcon, cifsFile->netfid);

		}

		kfree(cifsFile->search_resume_name);

		cifsFile->search_resume_name = NULL;

		if (cifsFile->srch_inf.ntwrk_buf_start) {

			cFYI(1, ("freeing SMB ff cache buf on search rewind"));

			if (cifsFile->srch_inf.smallBuf)
@@ -1043,9 +1041,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) 
		} /* else {

			cifsFile->invalidHandle = true;

			CIFSFindClose(xid, pTcon, cifsFile->netfid);

		}

		kfree(cifsFile->search_resume_name);

		cifsFile->search_resume_name = NULL; */

		} */



		rc = find_cifs_entry(xid, pTcon, file,

				&current_entry, &num_to_fill);