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

Commit ce5afed9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.samba.org/sfrench/cifs-2.6 

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: don't return error from standard_receive3 after marking response malformed
  cifs: request oplock when doing open on lookup
  cifs: fix error handling when cifscreds key payload is an error
parents ca81a621 ff4fa4a2

fs/cifs/connect.c

+5 −4
Original line number Diff line number Diff line
@@ -773,10 +773,11 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid) 
		cifs_dump_mem("Bad SMB: ", buf,

			min_t(unsigned int, server->total_read, 48));



	if (mid)

		handle_mid(mid, server, smb_buffer, length);



	if (!mid)

		return length;



	handle_mid(mid, server, smb_buffer, length);

	return 0;

}



static int
@@ -2125,7 +2126,7 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) 
	down_read(&key->sem);

	upayload = key->payload.data;

	if (IS_ERR_OR_NULL(upayload)) {

		rc = PTR_ERR(key);

		rc = upayload ? PTR_ERR(upayload) : -EINVAL;

		goto out_key_put;

	}

fs/cifs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
{

	int xid;

	int rc = 0; /* to get around spurious gcc warning, set to zero here */

	__u32 oplock = 0;

	__u32 oplock = enable_oplocks ? REQ_OPLOCK : 0;

	__u16 fileHandle = 0;

	bool posix_open = false;

	struct cifs_sb_info *cifs_sb;