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

Merge tag '6.13-rc4-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - fix caching of files that will be reused for write

 - minor cleanup

* tag '6.13-rc4-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Remove unused is_server_using_iface()
  smb: enable reuse of deferred file handles for write operations
parents fd0584d2 f17224c2

fs/smb/client/cifsproto.h

+0 −2
Original line number Diff line number Diff line
@@ -614,8 +614,6 @@ int cifs_alloc_hash(const char *name, struct shash_desc **sdesc); 
void cifs_free_hash(struct shash_desc **sdesc);



int cifs_try_adding_channels(struct cifs_ses *ses);

bool is_server_using_iface(struct TCP_Server_Info *server,

			   struct cifs_server_iface *iface);

bool is_ses_using_iface(struct cifs_ses *ses, struct cifs_server_iface *iface);

void cifs_ses_mark_for_reconnect(struct cifs_ses *ses);

fs/smb/client/file.c

+5 −1
Original line number Diff line number Diff line
@@ -990,7 +990,11 @@ int cifs_open(struct inode *inode, struct file *file) 
	}



	/* Get the cached handle as SMB2 close is deferred */

	if (OPEN_FMODE(file->f_flags) & FMODE_WRITE) {

		rc = cifs_get_writable_path(tcon, full_path, FIND_WR_FSUID_ONLY, &cfile);

	} else {

		rc = cifs_get_readable_path(tcon, full_path, &cfile);

	}

	if (rc == 0) {

		if (file->f_flags == cfile->f_flags) {

			file->private_data = cfile;

fs/smb/client/sess.c

+0 −25
Original line number Diff line number Diff line
@@ -27,31 +27,6 @@ static int 
cifs_ses_add_channel(struct cifs_ses *ses,

		     struct cifs_server_iface *iface);



bool

is_server_using_iface(struct TCP_Server_Info *server,

		      struct cifs_server_iface *iface)

{

	struct sockaddr_in *i4 = (struct sockaddr_in *)&iface->sockaddr;

	struct sockaddr_in6 *i6 = (struct sockaddr_in6 *)&iface->sockaddr;

	struct sockaddr_in *s4 = (struct sockaddr_in *)&server->dstaddr;

	struct sockaddr_in6 *s6 = (struct sockaddr_in6 *)&server->dstaddr;



	if (server->dstaddr.ss_family != iface->sockaddr.ss_family)

		return false;

	if (server->dstaddr.ss_family == AF_INET) {

		if (s4->sin_addr.s_addr != i4->sin_addr.s_addr)

			return false;

	} else if (server->dstaddr.ss_family == AF_INET6) {

		if (memcmp(&s6->sin6_addr, &i6->sin6_addr,

			   sizeof(i6->sin6_addr)) != 0)

			return false;

	} else {

		/* unknown family.. */

		return false;

	}

	return true;

}



bool is_ses_using_iface(struct cifs_ses *ses, struct cifs_server_iface *iface)

{

	int i;