Commit 98077a72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull CIFS fixes from Steve French.

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6: (40 commits)
  cifs: ensure that we always do cifsFileInfo_get under the spinlock
  CIFS: Make CAP_* checks protocol independent
  CIFS: Allow SMB2 statistics to be tracked
  CIFS: Move clear/print_stats code to ops struct
  CIFS: Add echo request support for SMB2
  CIFS: Move echo code to osp struct
  CIFS: Add SMB2 support for async requests
  CIFS: Setup async request in ops struct
  CIFS: Add SMB2 support for build_path_to_root
  CIFS: Move building path to root to ops struct
  CIFS: Query SMB2 inode info
  CIFS: Move query inode info code to ops struct
  CIFS: Add SMB2 support for is_path_accessible
  CIFS: Move is_path_accessible to ops struct
  CIFS: Move informational tcon calls to ops struct
  CIFS: Move getting dfs referalls to ops struct
  CIFS: Process reconnects for SMB2 shares
  CIFS: Add tree connect/disconnect capability for SMB2
  CIFS: Add session setup/logoff capability for SMB2
  CIFS: Add capability to send SMB2 negotiate message
  ...
parents f948ad07 764a1b1a

fs/cifs/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,4 +16,5 @@ cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o 


cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o



cifs-$(CONFIG_CIFS_SMB2) += smb2ops.o
 
cifs-$(CONFIG_CIFS_SMB2) += smb2ops.o smb2maperror.o smb2transport.o \

			    smb2misc.o smb2pdu.o smb2inode.o

fs/cifs/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static uint16_t cifs_super_get_key(const void *cookie_netfs_data, void *buffer, 


	sharename = extract_sharename(tcon->treeName);

	if (IS_ERR(sharename)) {

		cFYI(1, "%s: couldn't extract sharename\n", __func__);

		cFYI(1, "%s: couldn't extract sharename", __func__);

		sharename = NULL;

		return 0;

	}

fs/cifs/cifs_debug.c

+7 −55
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ void cifs_dump_detail(void *buf) 
	cERROR(1, "Cmd: %d Err: 0x%x Flags: 0x%x Flgs2: 0x%x Mid: %d Pid: %d",

		  smb->Command, smb->Status.CifsError,

		  smb->Flags, smb->Flags2, smb->Mid, smb->Pid);

	cERROR(1, "smb buf %p len %d", smb, smbCalcSize(smb));

	cERROR(1, "smb buf %p len %u", smb, smbCalcSize(smb));

#endif /* CONFIG_CIFS_DEBUG2 */

}
@@ -282,24 +282,8 @@ static ssize_t cifs_stats_proc_write(struct file *file, 
							  struct cifs_tcon,

							  tcon_list);

					atomic_set(&tcon->num_smbs_sent, 0);

					atomic_set(&tcon->num_writes, 0);

					atomic_set(&tcon->num_reads, 0);

					atomic_set(&tcon->num_oplock_brks, 0);

					atomic_set(&tcon->num_opens, 0);

					atomic_set(&tcon->num_posixopens, 0);

					atomic_set(&tcon->num_posixmkdirs, 0);

					atomic_set(&tcon->num_closes, 0);

					atomic_set(&tcon->num_deletes, 0);

					atomic_set(&tcon->num_mkdirs, 0);

					atomic_set(&tcon->num_rmdirs, 0);

					atomic_set(&tcon->num_renames, 0);

					atomic_set(&tcon->num_t2renames, 0);

					atomic_set(&tcon->num_ffirst, 0);

					atomic_set(&tcon->num_fnext, 0);

					atomic_set(&tcon->num_fclose, 0);

					atomic_set(&tcon->num_hardlinks, 0);

					atomic_set(&tcon->num_symlinks, 0);

					atomic_set(&tcon->num_locks, 0);

					if (server->ops->clear_stats)

						server->ops->clear_stats(tcon);

				}

			}

		}
@@ -358,42 +342,10 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) 
				seq_printf(m, "\n%d) %s", i, tcon->treeName);

				if (tcon->need_reconnect)

					seq_puts(m, "\tDISCONNECTED ");

				seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",

					atomic_read(&tcon->num_smbs_sent),

					atomic_read(&tcon->num_oplock_brks));

				seq_printf(m, "\nReads:  %d Bytes: %lld",

					atomic_read(&tcon->num_reads),

					(long long)(tcon->bytes_read));

				seq_printf(m, "\nWrites: %d Bytes: %lld",

					atomic_read(&tcon->num_writes),

					(long long)(tcon->bytes_written));

				seq_printf(m, "\nFlushes: %d",

					atomic_read(&tcon->num_flushes));

				seq_printf(m, "\nLocks: %d HardLinks: %d "

					      "Symlinks: %d",

					atomic_read(&tcon->num_locks),

					atomic_read(&tcon->num_hardlinks),

					atomic_read(&tcon->num_symlinks));

				seq_printf(m, "\nOpens: %d Closes: %d "

					      "Deletes: %d",

					atomic_read(&tcon->num_opens),

					atomic_read(&tcon->num_closes),

					atomic_read(&tcon->num_deletes));

				seq_printf(m, "\nPosix Opens: %d "

					      "Posix Mkdirs: %d",

					atomic_read(&tcon->num_posixopens),

					atomic_read(&tcon->num_posixmkdirs));

				seq_printf(m, "\nMkdirs: %d Rmdirs: %d",

					atomic_read(&tcon->num_mkdirs),

					atomic_read(&tcon->num_rmdirs));

				seq_printf(m, "\nRenames: %d T2 Renames %d",

					atomic_read(&tcon->num_renames),

					atomic_read(&tcon->num_t2renames));

				seq_printf(m, "\nFindFirst: %d FNext %d "

					      "FClose %d",

					atomic_read(&tcon->num_ffirst),

					atomic_read(&tcon->num_fnext),

					atomic_read(&tcon->num_fclose));

				seq_printf(m, "\nSMBs: %d",

					   atomic_read(&tcon->num_smbs_sent));

				if (server->ops->print_stats)

					server->ops->print_stats(m, tcon);

			}

		}

	}

fs/cifs/cifs_dfs_ref.c

+4 −3
Original line number Diff line number Diff line
@@ -275,7 +275,8 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 
	struct cifs_sb_info *cifs_sb;

	struct cifs_ses *ses;

	char *full_path;

	int xid, i;

	unsigned int xid;

	int i;

	int rc;

	struct vfsmount *mnt;

	struct tcon_link *tlink;
@@ -302,11 +303,11 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 
	}

	ses = tlink_tcon(tlink)->ses;



	xid = GetXid();

	xid = get_xid();

	rc = get_dfs_path(xid, ses, full_path + 1, cifs_sb->local_nls,

		&num_referrals, &referrals,

		cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	FreeXid(xid);

	free_xid(xid);



	cifs_put_tlink(tlink);

fs/cifs/cifs_unicode.c

+60 −0
Original line number Diff line number Diff line
@@ -331,3 +331,63 @@ ctoUTF16_out: 
	return i;

}



#ifdef CONFIG_CIFS_SMB2

/*

 * cifs_local_to_utf16_bytes - how long will a string be after conversion?

 * @from - pointer to input string

 * @maxbytes - don't go past this many bytes of input string

 * @codepage - source codepage

 *

 * Walk a string and return the number of bytes that the string will

 * be after being converted to the given charset, not including any null

 * termination required. Don't walk past maxbytes in the source buffer.

 */



static int

cifs_local_to_utf16_bytes(const char *from, int len,

			  const struct nls_table *codepage)

{

	int charlen;

	int i;

	wchar_t wchar_to;



	for (i = 0; len && *from; i++, from += charlen, len -= charlen) {

		charlen = codepage->char2uni(from, len, &wchar_to);

		/* Failed conversion defaults to a question mark */

		if (charlen < 1)

			charlen = 1;

	}

	return 2 * i; /* UTF16 characters are two bytes */

}



/*

 * cifs_strndup_to_utf16 - copy a string to wire format from the local codepage

 * @src - source string

 * @maxlen - don't walk past this many bytes in the source string

 * @utf16_len - the length of the allocated string in bytes (including null)

 * @cp - source codepage

 * @remap - map special chars

 *

 * Take a string convert it from the local codepage to UTF16 and

 * put it in a new buffer. Returns a pointer to the new string or NULL on

 * error.

 */

__le16 *

cifs_strndup_to_utf16(const char *src, const int maxlen, int *utf16_len,

		      const struct nls_table *cp, int remap)

{

	int len;

	__le16 *dst;



	len = cifs_local_to_utf16_bytes(src, maxlen, cp);

	len += 2; /* NULL */

	dst = kmalloc(len, GFP_KERNEL);

	if (!dst) {

		*utf16_len = 0;

		return NULL;

	}

	cifsConvertToUTF16(dst, src, strlen(src), cp, remap);

	*utf16_len = len;

	return dst;

}

#endif /* CONFIG_CIFS_SMB2 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE