Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262630
b: refs/heads/master
c: b802898
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Layton authored and Steve French committed Aug 3, 2011
1 parent 2108b86 commit d532d56
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc05a78efb8e91e884017bb0bc43f690aa5b4dcd
refs/heads/master: b80289833463215d2f3d1d72cf735fc7ba78da57
5 changes: 3 additions & 2 deletions trunk/fs/cifs/cifs_dfs_ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,11 @@ char *cifs_compose_mount_options(const char *sb_mountdata,

rc = dns_resolve_server_name_to_ip(*devname, &srvIP);
if (rc < 0) {
cERROR(1, "%s: Failed to resolve server part of %s to IP: %d",
__func__, *devname, rc);
cFYI(1, "%s: Failed to resolve server part of %s to IP: %d",
__func__, *devname, rc);
goto compose_mount_options_err;
}

/* md_len = strlen(...) + 12 for 'sep+prefixpath='
* assuming that we have 'unc=' and 'ip=' in
* the original sb_mountdata
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/cifs/dns_resolve.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
/* Perform the upcall */
rc = dns_query(NULL, hostname, len, NULL, ip_addr, NULL);
if (rc < 0)
cERROR(1, "%s: unable to resolve: %*.*s",
__func__, len, len, hostname);
cFYI(1, "%s: unable to resolve: %*.*s",
__func__, len, len, hostname);
else
cFYI(1, "%s: resolved: %*.*s to %s",
__func__, len, len, hostname, *ip_addr);
Expand Down

0 comments on commit d532d56

Please sign in to comment.