[patch] cifs: update a check for NULL function pointer

[Dan Carpenter]

We changed the function call from ->close() to ->close_dir() so we
should update the test for NULL as well.

Both of them probably work, but my static checker complains when we have
a check for a NULL function pointer and then immediately call a
different function pointer. This is a common cut and paste error.

Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+***@public.gmane.org>

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 41e52e2..d2141f1 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -592,7 +592,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos,
if (server->ops->dir_needs_close(cfile)) {
cfile->invalidHandle = true;
spin_unlock(&cifs_file_list_lock);
- if (server->ops->close)
+ if (server->ops->close_dir)
server->ops->close_dir(xid, tcon, &cfile->fid);
} else
spin_unlock(&cifs_file_list_lock);

[Pavel Shilovsky]

Post by Dan Carpenter
We changed the function call from ->close() to ->close_dir() so we
should update the test for NULL as well.
Both of them probably work, but my static checker complains when we have
a check for a NULL function pointer and then immediately call a
different function pointer. This is a common cut and paste error.
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 41e52e2..d2141f1 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -592,7 +592,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos,
if (server->ops->dir_needs_close(cfile)) {
cfile->invalidHandle = true;
spin_unlock(&cifs_file_list_lock);
- if (server->ops->close)
+ if (server->ops->close_dir)
server->ops->close_dir(xid, tcon, &cfile->fid);
} else
spin_unlock(&cifs_file_list_lock);
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
More majordomo info at http://vger.kernel.org/majordomo-info.html

This looks right, thanks.

Dan, would you mind if I merge your code change as well as your
Signed-off-by line into the original patch "CIFS: Fix wrong restart
readdir for SMB1" since the latter hasn't been merged into the
mainline yet?

[Dan Carpenter]

Post by Pavel Shilovsky
Dan, would you mind if I merge your code change as well as your
Signed-off-by line into the original patch "CIFS: Fix wrong restart
readdir for SMB1" since the latter hasn't been merged into the
mainline yet?

Sure. No problem.

regards,
dan carpenter

[Pavel Shilovsky]

Post by Dan Carpenter

Post by Pavel Shilovsky
Dan, would you mind if I merge your code change as well as your
Signed-off-by line into the original patch "CIFS: Fix wrong restart
readdir for SMB1" since the latter hasn't been merged into the
mainline yet?

Sure. No problem.

Thanks. Posted the second version to the list.