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

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

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs/smb3 fixes from Steve French:
 "Fixes for problems found during testing and debugging at the SMB3
  storage test event (plugfest) this week"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  Fix mfsymlinks file size check
  Update version number displayed by modinfo for cifs.ko
  cifs: remove dead code
  Revert "cifs: No need to send SIGKILL to demux_thread during umount"
  [SMB3] Fix oops when creating symlinks on smb3
  [CIFS] Fix setting time before epoch (negative time values)
parents 33d31d34 364d4293

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -136,5 +136,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* CONFIG_CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "2.04"

#define CIFS_VERSION   "2.05"

#endif				/* _CIFSFS_H */

fs/cifs/connect.c

+19 −0
Original line number Diff line number Diff line
@@ -837,6 +837,7 @@ cifs_demultiplex_thread(void *p) 
	struct TCP_Server_Info *server = p;

	unsigned int pdu_length;

	char *buf = NULL;

	struct task_struct *task_to_wake = NULL;

	struct mid_q_entry *mid_entry;



	current->flags |= PF_MEMALLOC;
@@ -927,7 +928,19 @@ cifs_demultiplex_thread(void *p) 
	if (server->smallbuf) /* no sense logging a debug message if NULL */

		cifs_small_buf_release(server->smallbuf);



	task_to_wake = xchg(&server->tsk, NULL);

	clean_demultiplex_info(server);



	/* if server->tsk was NULL then wait for a signal before exiting */

	if (!task_to_wake) {

		set_current_state(TASK_INTERRUPTIBLE);

		while (!signal_pending(current)) {

			schedule();

			set_current_state(TASK_INTERRUPTIBLE);

		}

		set_current_state(TASK_RUNNING);

	}



	module_put_and_exit(0);

}
@@ -2050,6 +2063,8 @@ cifs_find_tcp_session(struct smb_vol *vol) 
static void

cifs_put_tcp_session(struct TCP_Server_Info *server)

{

	struct task_struct *task;



	spin_lock(&cifs_tcp_ses_lock);

	if (--server->srv_count > 0) {

		spin_unlock(&cifs_tcp_ses_lock);
@@ -2073,6 +2088,10 @@ cifs_put_tcp_session(struct TCP_Server_Info *server) 
	kfree(server->session_key.response);

	server->session_key.response = NULL;

	server->session_key.len = 0;



	task = xchg(&server->tsk, NULL);

	if (task)

		force_sig(SIGKILL, task);

}



static struct TCP_Server_Info *

fs/cifs/link.c

+9 −3
Original line number Diff line number Diff line
@@ -213,8 +213,12 @@ create_mf_symlink(const unsigned int xid, struct cifs_tcon *tcon, 
	if (rc)

		goto out;



	rc = tcon->ses->server->ops->create_mf_symlink(xid, tcon, cifs_sb,

					fromName, buf, &bytes_written);

	if (tcon->ses->server->ops->create_mf_symlink)

		rc = tcon->ses->server->ops->create_mf_symlink(xid, tcon,

					cifs_sb, fromName, buf, &bytes_written);

	else

		rc = -EOPNOTSUPP;



	if (rc)

		goto out;
@@ -339,9 +343,11 @@ cifs_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, 
	if (rc)

		return rc;



	if (file_info.EndOfFile != cpu_to_le64(CIFS_MF_SYMLINK_FILE_SIZE))

	if (file_info.EndOfFile != cpu_to_le64(CIFS_MF_SYMLINK_FILE_SIZE)) {

		rc = -ENOENT;

		/* it's not a symlink */

		goto out;

	}



	io_parms.netfid = fid.netfid;

	io_parms.pid = current->tgid;

fs/cifs/netmisc.c

+16 −4
Original line number Diff line number Diff line
@@ -925,11 +925,23 @@ cifs_NTtimeToUnix(__le64 ntutc) 
	/* BB what about the timezone? BB */



	/* Subtract the NTFS time offset, then convert to 1s intervals. */

	u64 t;

	s64 t = le64_to_cpu(ntutc) - NTFS_TIME_OFFSET;



	t = le64_to_cpu(ntutc) - NTFS_TIME_OFFSET;

	ts.tv_nsec = do_div(t, 10000000) * 100;

	/*

	 * Unfortunately can not use normal 64 bit division on 32 bit arch, but

	 * the alternative, do_div, does not work with negative numbers so have

	 * to special case them

	 */

	if (t < 0) {

		t = -t;

		ts.tv_nsec = (long)(do_div(t, 10000000) * 100);

		ts.tv_nsec = -ts.tv_nsec;

		ts.tv_sec = -t;

	} else {

		ts.tv_nsec = (long)do_div(t, 10000000) * 100;

		ts.tv_sec = t;

	}



	return ts;

}

fs/cifs/sess.c

+0 −17
Original line number Diff line number Diff line
@@ -745,14 +745,6 @@ sess_auth_lanman(struct sess_data *sess_data) 
	sess_free_buffer(sess_data);

}



#else



static void

sess_auth_lanman(struct sess_data *sess_data)

{

	sess_data->result = -EOPNOTSUPP;

	sess_data->func = NULL;

}

#endif



static void
@@ -1103,15 +1095,6 @@ sess_auth_kerberos(struct sess_data *sess_data) 
	ses->auth_key.response = NULL;

}



#else



static void

sess_auth_kerberos(struct sess_data *sess_data)

{

	cifs_dbg(VFS, "Kerberos negotiated but upcall support disabled!\n");

	sess_data->result = -ENOSYS;

	sess_data->func = NULL;

}

#endif /* ! CONFIG_CIFS_UPCALL */



/*