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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  Make CIFS mount work in a container.
  CIFS: Remove pointless variable assignment in cifs_dfs_do_automount()
parents 842d9b2c f1d0c998

fs/cifs/cifs_dfs_ref.c

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 


	cifs_sb = CIFS_SB(mntpt->d_inode->i_sb);

	tlink = cifs_sb_tlink(cifs_sb);

	mnt = ERR_PTR(-EINVAL);

	if (IS_ERR(tlink)) {

		mnt = ERR_CAST(tlink);

		goto free_full_path;

fs/cifs/cifsglob.h

+33 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ struct TCP_Server_Info { 
	struct socket *ssocket;

	struct sockaddr_storage dstaddr;

	struct sockaddr_storage srcaddr; /* locally bind to this IP */

#ifdef CONFIG_NET_NS

	struct net *net;

#endif

	wait_queue_head_t response_q;

	wait_queue_head_t request_q; /* if more than maxmpx to srvr must block*/

	struct list_head pending_mid_q;
@@ -216,6 +219,36 @@ struct TCP_Server_Info { 
#endif

};



/*

 * Macros to allow the TCP_Server_Info->net field and related code to drop out

 * when CONFIG_NET_NS isn't set.

 */



#ifdef CONFIG_NET_NS



static inline struct net *cifs_net_ns(struct TCP_Server_Info *srv)

{

	return srv->net;

}



static inline void cifs_set_net_ns(struct TCP_Server_Info *srv, struct net *net)

{

	srv->net = net;

}



#else



static inline struct net *cifs_net_ns(struct TCP_Server_Info *srv)

{

	return &init_net;

}



static inline void cifs_set_net_ns(struct TCP_Server_Info *srv, struct net *net)

{

}



#endif



/*

 * Session structure.  One of these for each uid session with a particular host

 */

fs/cifs/connect.c

+10 −2
Original line number Diff line number Diff line
@@ -1568,6 +1568,9 @@ cifs_find_tcp_session(struct sockaddr *addr, struct smb_vol *vol) 


	spin_lock(&cifs_tcp_ses_lock);

	list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {

		if (!net_eq(cifs_net_ns(server), current->nsproxy->net_ns))

			continue;



		if (!match_address(server, addr,

				   (struct sockaddr *)&vol->srcaddr))

			continue;
@@ -1598,6 +1601,8 @@ cifs_put_tcp_session(struct TCP_Server_Info *server) 
		return;

	}



	put_net(cifs_net_ns(server));



	list_del_init(&server->tcp_ses_list);

	spin_unlock(&cifs_tcp_ses_lock);
@@ -1672,6 +1677,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info) 
		goto out_err;

	}



	cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns));

	tcp_ses->hostname = extract_hostname(volume_info->UNC);

	if (IS_ERR(tcp_ses->hostname)) {

		rc = PTR_ERR(tcp_ses->hostname);
@@ -1752,6 +1758,8 @@ cifs_get_tcp_session(struct smb_vol *volume_info) 
out_err_crypto_release:

	cifs_crypto_shash_release(tcp_ses);



	put_net(cifs_net_ns(tcp_ses));



out_err:

	if (tcp_ses) {

		if (!IS_ERR(tcp_ses->hostname))
@@ -2263,8 +2271,8 @@ generic_ip_connect(struct TCP_Server_Info *server) 
	}



	if (socket == NULL) {

		rc = sock_create_kern(sfamily, SOCK_STREAM,

				      IPPROTO_TCP, &socket);

		rc = __sock_create(cifs_net_ns(server), sfamily, SOCK_STREAM,

				   IPPROTO_TCP, &socket, 1);

		if (rc < 0) {

			cERROR(1, "Error %d creating socket", rc);

			server->ssocket = NULL;