[PATCH 12/13] fs/cifs: Remove redundant test
Julia Lawall
julia at diku.dk
Sun Dec 21 15:41:57 GMT 2008
From: Julia Lawall <julia at diku.dk>
In fs/cifs/cifssmb.c, pLockData is tested for being NULL at the beginning
of the function, and not reassigned subsequently.
In fs/xfs/xfs_trans_buf.c, bp is tested for being NULL just a few lines
above.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x at p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x at p2 == NULL
|
x at p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x at p1
(
x at p2 == NULL
|
x at p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x at p2 != NULL) || ...)
S1
|
- if ((x at p2 == NULL) && ...) S1
|
- BUG_ON(x at p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
---
fs/cifs/cifssmb.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 824df14..552642a 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -1871,10 +1871,6 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
rc = -EIO; /* bad smb */
goto plk_err_exit;
}
- if (pLockData == NULL) {
- rc = -EINVAL;
- goto plk_err_exit;
- }
data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
data_count = le16_to_cpu(pSMBr->t2.DataCount);
if (data_count < sizeof(struct cifs_posix_lock)) {
More information about the samba-technical
mailing list