[PATCH 3/6] autofs4 - collect version check return

From: Ian Kent
Date: Wed Oct 22 2008 - 22:35:48 EST


The function check_dev_ioctl_version() returns an error code upon fail
but it isn't captured and returned in validate_dev_ioctl() as it should
be.

Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
Signed-off-by: Jeff Moyer <jmoyer@xxxxxxxxxx>

---

fs/autofs4/dev-ioctl.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 304c1ff..63bfb5d 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -116,9 +116,9 @@ static inline void free_dev_ioctl(struct autofs_dev_ioctl *param)
*/
static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)
{
- int err = -EINVAL;
+ int err;

- if (check_dev_ioctl_version(cmd, param)) {
+ if ((err = check_dev_ioctl_version(cmd, param))) {
AUTOFS_WARN("invalid device control module version "
"supplied for cmd(0x%08x)", cmd);
goto out;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/