The patch titled
cifs: remove useless checks in connect.c
has been added to the -mm tree. Its filename is
remove-useless-checks-in-cifs-connectc.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cifs: remove useless checks in connect.c
From: Dave Jones <davej@xxxxxxxxxx>
The ; at the end of the 2nd if line in this diff caught my eye. On closer
inspection the whole line is unnecessary anyway as kfree(NULL) is ok.
Also nuked another one a few lines up.
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/cifs/connect.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -puN fs/cifs/connect.c~remove-useless-checks-in-cifs-connectc fs/cifs/connect.c
--- a/fs/cifs/connect.c~remove-useless-checks-in-cifs-connectc
+++ a/fs/cifs/connect.c
@@ -2832,15 +2832,13 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned i
= 0;
} /* 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);
}
} else { /* no room so create dummy domain and NOS string */
- if(ses->serverDomain);
- kfree(ses->serverDomain);
+ kfree(ses->serverDomain);
ses->serverDomain =
kzalloc(2, GFP_KERNEL);
if(ses->serverNOS)
_
Patches currently in -mm which might be from davej@xxxxxxxxxx are
origin.patch
git-acpi.patch
git-agpgart.patch
git-block.patch
remove-useless-checks-in-cifs-connectc.patch
git-cpufreq.patch
fix-up-funky-logic-in-dvb.patch
stv680-boolean-logic-bug.patch
remove-silly-messages-from-input-layer.patch
fix-oddball-boolean-logic-in-s390-netiucv.patch
s390-broken-null-test-in-claw-driver.patch
fix-ide-locking-error.patch
post-halloween-doc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
