Re: linux-next: cifs tree build failure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Steve,

On Wed, 3 Dec 2008 13:53:12 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today I have fixed this by applying a merge fix patch (see below) and
> will carry this as necessary.

An even better fix (as far as I am concerned) would be for you to pull
the net tree into the cifs tree (since the net tree will *never* rebase,
this is safe) and then apply the following two fixups as part of the
merge.  Or if you want to rebase the cifs tree, then use a merge of
Linus' tree and the net tree as the base and fix up the relevent commits
with the following.

That way, I don't have to carry these fixups ...  I have had to reapply
the fist once already as things continue to change.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

diff --cc fs/cifs/connect.c
index 204bd13,3519420..0000000
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@@ -2228,8 -2269,12 +2269,12 @@@ cifs_mount(struct super_block *sb, stru
  
  		/* new SMB session uses our srvTcp ref */
  		pSesInfo->server = srvTcp;
- 		sprintf(pSesInfo->serverName, "%pI4",
- 			&sin_server->sin_addr.s_addr);
+ 		if (srvTcp->addr.sockAddr6.sin6_family == AF_INET6)
 -			sprintf(pSesInfo->serverName, NIP6_FMT,
 -				NIP6(srvTcp->addr.sockAddr6.sin6_addr));
++			sprintf(pSesInfo->serverName, "%pI6",
++				&srvTcp->addr.sockAddr6.sin6_addr);
+ 		else
 -			sprintf(pSesInfo->serverName, NIPQUAD_FMT,
 -				NIPQUAD(srvTcp->addr.sockAddr.sin_addr.s_addr));
++			sprintf(pSesInfo->serverName, "%pI4",
++				&srvTcp->addr.sockAddr.sin_addr.s_addr);
  
  		write_lock(&cifs_tcp_ses_lock);
  		list_add(&pSesInfo->smb_ses_list, &srvTcp->smb_ses_list);

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 061a1dc..1b09330 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -362,12 +362,12 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
 					switch (server->addr.sockAddr6.
 						sin6_family) {
 					case AF_INET6:
-						seq_printf(s, NIP6_FMT,
-							   NIP6(server->addr.sockAddr6.sin6_addr));
+						seq_printf(s, "%pI6",
+							   &server->addr.sockAddr6.sin6_addr);
 						break;
 					case AF_INET:
-						seq_printf(s, NIPQUAD_FMT,
-							   NIPQUAD(server->addr.sockAddr.sin_addr.s_addr));
+						seq_printf(s, "%pI4",
+							   &server->addr.sockAddr.sin_addr.s_addr);
 						break;
 					}
 				}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux