| Message ID | 1342634346-22818-12-git-send-email-jlayton@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2012/7/18 Jeff Layton <jlayton@redhat.com>: > Now that we're using TCP_CORK on the socket, there's no value in > continuting to support this option. Schedule it for removal in 3.8. > > Signed-off-by: Jeff Layton <jlayton@redhat.com> > --- > fs/cifs/connect.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c > index 303be53..29d9716 100644 > --- a/fs/cifs/connect.c > +++ b/fs/cifs/connect.c > @@ -1830,12 +1830,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, > if (string == NULL) > goto out_nomem; > > - /* > - * FIXME: since we now cork/uncork the socket while > - * sending, should we deprecate this option? > - */ > - if (strnicmp(string, "TCP_NODELAY", 11) == 0) > + if (strnicmp(string, "TCP_NODELAY", 11) == 0) { > + printk(KERN_WARNING, "CIFS: the " > + "sockopt=TCP_NODELAY option has been " > + "deprecated and will be removed " > + "in 3.8\n"); > vol->sockopt_tcp_nodelay = 1; > + } > break; > case Opt_netbiosname: > string = match_strdup(args); > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 303be53..29d9716 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1830,12 +1830,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, if (string == NULL) goto out_nomem; - /* - * FIXME: since we now cork/uncork the socket while - * sending, should we deprecate this option? - */ - if (strnicmp(string, "TCP_NODELAY", 11) == 0) + if (strnicmp(string, "TCP_NODELAY", 11) == 0) { + printk(KERN_WARNING, "CIFS: the " + "sockopt=TCP_NODELAY option has been " + "deprecated and will be removed " + "in 3.8\n"); vol->sockopt_tcp_nodelay = 1; + } break; case Opt_netbiosname: string = match_strdup(args);
Now that we're using TCP_CORK on the socket, there's no value in continuting to support this option. Schedule it for removal in 3.8. Signed-off-by: Jeff Layton <jlayton@redhat.com> --- fs/cifs/connect.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)