| Message ID | 33feb04c647d39629feb6252488214b05e297f44.1246173683.git.joe@perches.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
This fix is fine of course. Do you prefer that I merge this via the cifs-2.6 tree or as part of your large patch series? On Sun, Jun 28, 2009 at 11:27 AM, Joe Perches<joe@perches.com> wrote: > Signed-off-by: Joe Perches <joe@perches.com> > --- > Â fs/cifs/cifs_dfs_ref.c | Â Â 2 +- > Â 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c > index 3bb11be..3f2c2a3 100644 > --- a/fs/cifs/cifs_dfs_ref.c > +++ b/fs/cifs/cifs_dfs_ref.c > @@ -136,7 +136,7 @@ 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));; > + Â Â Â Â Â Â Â Â Â Â Â Â __func__, *devname, rc)); > Â Â Â Â Â Â Â Â goto compose_mount_options_err; > Â Â Â Â } > Â Â Â Â /* md_len = strlen(...) + 12 for 'sep+prefixpath=' > -- > 1.6.3.1.10.g659a0.dirty > >
On Sun, 2009-06-28 at 11:45 -0500, Steve French wrote: > This fix is fine of course. > > Do you prefer that I merge this via the cifs-2.6 tree or as part of > your large patch series? I don't have a preference for how it gets merged. Perhaps others do.
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 3bb11be..3f2c2a3 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c @@ -136,7 +136,7 @@ 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));; + __func__, *devname, rc)); goto compose_mount_options_err; } /* md_len = strlen(...) + 12 for 'sep+prefixpath='
Signed-off-by: Joe Perches <joe@perches.com> --- fs/cifs/cifs_dfs_ref.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)