aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-05-30 18:08:26 +0000
committerSteve French <sfrench@us.ibm.com>2006-05-30 18:08:26 +0000
commit08775834c412c48f3539ef7ed073fff58e3cf419 (patch)
treeefa1a6b41e8d0017f7bcf2352f935b700286e876
parentcec6815a12edc91b123394f29d672cb9fa6cf79f (diff)
[CIFS] Fix typos in previous fix
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/connect.c6
-rw-r--r--fs/cifs/file.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index f6ffb5bd29f..bae1479318d 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2490,7 +2490,7 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,
} /* else no more room so create dummy domain string */
else {
if(ses->serverDomain)
- ` kfree(ses->serverDomain);
+ kfree(ses->serverDomain);
ses->serverDomain =
kzalloc(2,GFP_KERNEL);
}
@@ -2528,7 +2528,7 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,
len = strnlen(bcc_ptr, 1024);
if(ses->serverDomain)
- kfree(ses->severDomain);
+ kfree(ses->serverDomain);
ses->serverDomain = kzalloc(len + 1, GFP_KERNEL);
strncpy(ses->serverDomain, bcc_ptr, len);
bcc_ptr += len;
@@ -3174,7 +3174,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
the end since (at least) WIN2K and Windows XP have a major bug in not null
terminating last Unicode string in response */
if(ses->serverOS)
- kfree(serverOS);
+ kfree(ses->serverOS);
ses->serverOS =
kzalloc(2 * (len + 1), GFP_KERNEL);
cifs_strfromUCS_le(ses->serverOS,
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index c881a1a29f0..5e59723c02b 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -905,8 +905,8 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
break;
}
if(experimEnabled || (pTcon->ses->server &&
- (pTcon->ses->server->secMode &
- (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)
+ ((pTcon->ses->server->secMode &
+ (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
== 0))) {
struct kvec iov[2];
unsigned int len;