Commit 0fd1ffe0 authored by Pavel Machek's avatar Pavel Machek Committed by Steve French
Browse files

[CIFS] Fix suspend/resume problem which causes EIO on subsequent access to 


the mount.

Signed-off-by: default avatarPavel Machek <pavel@suse.de>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 6344a423

fs/cifs/connect.c

+12 −12
Original line number Diff line number Diff line
@@ -367,20 +367,20 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) 
			continue;

		if (bigbuf == NULL) {

			bigbuf = cifs_buf_get();

			if(bigbuf == NULL) {

			if (!bigbuf) {

				cERROR(1, ("No memory for large SMB response"));

				msleep(3000);

				/* retry will check if exiting */

				continue;

			}

		} else if (isLargeBuf) {

			/* we are reusing a dirtry large buf, clear its start */

			/* we are reusing a dirty large buf, clear its start */

			memset(bigbuf, 0, sizeof (struct smb_hdr));

		}



		if (smallbuf == NULL) {

			smallbuf = cifs_small_buf_get();

			if(smallbuf == NULL) {

			if (!smallbuf) {

				cERROR(1, ("No memory for SMB response"));

				msleep(1000);

				/* retry will check if exiting */
@@ -423,7 +423,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) 
				   and so simply return error to mount */

				break;

			}

			if(length == -EINTR) { 

			if (!try_to_freeze() && (length == -EINTR)) {

				cFYI(1,("cifsd thread killed"));

				break;

			}

fs/cifs/cifsfs.c

+1 −1

File changed.

Contains only whitespace changes.