autofs: remove possibly misleading /* #define DEBUG */
Subsystems (2)
Ian Kent
maintainerPATCH 1/3 autofs: remove possibly misleading /* #define DEBUG */
From: Tomohiro Kusumi <[email protected]>
Having this in autofs_i.h gives illusion that uncommenting this enables pr_debug(), but it doesn't enable all the pr_debug() in autofs because inclusion order matters.
XFS has the same DEBUG macro in its core header fs/xfs/xfs.h, however XFS seems to have a rule to include this prior to other XFS headers as well as kernel headers. This is not the case with autofs, and DEBUG could be enabled via Makefile, so autofs should just get rid of this comment to make the code less confusing. It's a comment, so there is literally no functional difference.
--- fs/autofs4/autofs_i.h | 2 -- 1 file changed, 2 deletions(-)
fs/autofs4/autofs_i.h +0 -2
@@ -34,8 +34,6 @@#include <asm/current.h> #include <linux/uaccess.h> -/* #define DEBUG */ -#ifdef pr_fmt#undef pr_fmt#endif
Ian Kent
maintainerPATCH 2/3 autofs: refactor ioctl fn vector in iookup_dev_ioctl()
From: Tomohiro Kusumi <[email protected]>
cmd part of this struct is the same as an index of itself within _ioctls[]. In fact this cmd is unused, so we can drop this part.
--- fs/autofs4/dev-ioctl.c | 49 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-)
fs/autofs4/dev-ioctl.c +16 -33
@@ -597,42 +597,25 @@ out:static ioctl_fn lookup_dev_ioctl (unsigned int cmd) { -static struct { -int cmd; -ioctl_fn fn; - } _ioctls[] = { - {cmd_idx (AUTOFS_DEV_IOCTL_VERSION_CMD ), - autofs_dev_ioctl_version}, - {cmd_idx (AUTOFS_DEV_IOCTL_PROTOVER_CMD ), - autofs_dev_ioctl_protover}, - {cmd_idx (AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD ), - autofs_dev_ioctl_protosubver}, - {cmd_idx (AUTOFS_DEV_IOCTL_OPENMOUNT_CMD ), - autofs_dev_ioctl_openmount}, - {cmd_idx (AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD ), - autofs_dev_ioctl_closemount}, - {cmd_idx (AUTOFS_DEV_IOCTL_READY_CMD ), - autofs_dev_ioctl_ready}, - {cmd_idx (AUTOFS_DEV_IOCTL_FAIL_CMD ), - autofs_dev_ioctl_fail}, - {cmd_idx (AUTOFS_DEV_IOCTL_SETPIPEFD_CMD ), - autofs_dev_ioctl_setpipefd}, - {cmd_idx (AUTOFS_DEV_IOCTL_CATATONIC_CMD ), - autofs_dev_ioctl_catatonic}, - {cmd_idx (AUTOFS_DEV_IOCTL_TIMEOUT_CMD ), - autofs_dev_ioctl_timeout}, - {cmd_idx (AUTOFS_DEV_IOCTL_REQUESTER_CMD ), - autofs_dev_ioctl_requester}, - {cmd_idx (AUTOFS_DEV_IOCTL_EXPIRE_CMD ), - autofs_dev_ioctl_expire}, - {cmd_idx (AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD ), - autofs_dev_ioctl_askumount}, - {cmd_idx (AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD ), - autofs_dev_ioctl_ismountpoint} +static ioctl_fn _ioctls[] = { + autofs_dev_ioctl_version, + autofs_dev_ioctl_protover, + autofs_dev_ioctl_protosubver, + autofs_dev_ioctl_openmount, + autofs_dev_ioctl_closemount, + autofs_dev_ioctl_ready, + autofs_dev_ioctl_fail, + autofs_dev_ioctl_setpipefd, + autofs_dev_ioctl_catatonic, + autofs_dev_ioctl_timeout, + autofs_dev_ioctl_requester, + autofs_dev_ioctl_expire, + autofs_dev_ioctl_askumount, + autofs_dev_ioctl_ismountpoint, };unsigned int idx =cmd_idx (cmd); -return (idx >=ARRAY_SIZE (_ioctls)) ?NULL : _ioctls[idx].fn; +return (idx >=ARRAY_SIZE (_ioctls)) ?NULL : _ioctls[idx]; }/* ioctl dispatcher */
Ian Kent
maintainerPATCH 3/3 autofs: fix "fix dev ioctl number range check"
In reply to Ian KentFrom: Tomohiro Kusumi <[email protected]>
102a340f had a typo that made the count macro negative (-13). The acutal check used by ioctl is ((cmd - cmd_first) > COUNT), so it needs to be positive (13).
* 102a340f is a commit in linux-next which hasn't been merged to mainline upstream.
--- fs/autofs4/autofs_i.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/autofs4/autofs_i.h +1 -1
@@ -21,7 +21,7 @@#define AUTOFS_DEV_IOCTL_IOC_FIRST (AUTOFS_DEV_IOCTL_VERSION)#define AUTOFS_DEV_IOCTL_IOC_COUNT \ - (AUTOFS_DEV_IOCTL_VERSION_CMD - AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD) + (AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD - AUTOFS_DEV_IOCTL_VERSION_CMD)#include <linux/kernel.h> #include <linux/slab.h>