diff -up autofs-5.0.3/daemon/indirect.c.device-node-control autofs-5.0.3/daemon/indirect.c

--- autofs-5.0.3/daemon/indirect.c.device-node-control	2008-02-25 08:58:46.000000000 +0900

+++ autofs-5.0.3/daemon/indirect.c	2008-02-25 09:03:12.000000000 +0900

@@ -43,6 +43,8 @@ extern pthread_attr_t thread_attr;

 static pthread_mutex_t ma_mutex = PTHREAD_MUTEX_INITIALIZER;

 static pthread_mutex_t ea_mutex = PTHREAD_MUTEX_INITIALIZER;

+static const unsigned int indirect = AUTOFS_TYPE_INDIRECT;

+

 static int unlink_mount_tree(struct autofs_point *ap, struct mnt_list *mnts)

 {

 	struct mnt_list *this;

@@ -88,19 +90,20 @@ static int unlink_mount_tree(struct auto

 static int do_mount_autofs_indirect(struct autofs_point *ap)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	time_t timeout = ap->exp_timeout;

 	char *options = NULL;

 	const char *type, *map_name = NULL;

 	struct stat st;

 	struct mnt_list *mnts;

-	int cl_flags, ret;

+	int ret;

 	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 1);

 	if (mnts) {

 		ret = unlink_mount_tree(ap, mnts);

 		free_mnt_list(mnts);

 		if (!ret) {

-			debug(ap->logopt,

+			error(ap->logopt,

 			      "already mounted as other than autofs "

 			      "or failed to unlink entry in tree");

 			goto out_err;

@@ -108,8 +111,10 @@ static int do_mount_autofs_indirect(stru

 	}

 	options = make_options_string(ap->path, ap->kpipefd, NULL);

-	if (!options)

+	if (!options) {

+		error(ap->logopt, "options string error");

 		goto out_err;

+	}

 	/* In case the directory doesn't exist, try to mkdir it */

 	if (mkdir_path(ap->path, 0555) < 0) {

@@ -147,22 +152,15 @@ static int do_mount_autofs_indirect(stru

 	options = NULL;

-	/* Root directory for ioctl()'s */

-	ap->ioctlfd = open(ap->path, O_RDONLY);

-	if (ap->ioctlfd < 0) {

+	if (ops->open(ap->logopt, &ap->ioctlfd, -1, ap->path, indirect)) {

 		crit(ap->logopt,

 		     "failed to create ioctl fd for autofs path %s", ap->path);

 		goto out_umount;

 	}

-	if ((cl_flags = fcntl(ap->ioctlfd, F_GETFD, 0)) != -1) {

-		cl_flags |= FD_CLOEXEC;

-		fcntl(ap->ioctlfd, F_SETFD, cl_flags);

-	}

-

 	ap->exp_runfreq = (timeout + CHECK_RATIO - 1) / CHECK_RATIO;

-	ioctl(ap->ioctlfd, AUTOFS_IOC_SETTIMEOUT, &timeout);

+	ops->timeout(ap->logopt, ap->ioctlfd, &timeout);

 	if (ap->exp_timeout)

 		info(ap->logopt,

@@ -235,8 +233,10 @@ int mount_autofs_indirect(struct autofs_

 int umount_autofs_indirect(struct autofs_point *ap)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	char buf[MAX_ERR_BUF];

-	int ret, rv, retries;

+	int rv, retries;

+	unsigned int ret;

 	/*

 	 * Since submounts look after themselves the parent never knows

@@ -248,7 +248,7 @@ int umount_autofs_indirect(struct autofs

 		lookup_source_close_ioctlfd(ap->parent, ap->path);

 	/* If we are trying to shutdown make sure we can umount */

-	rv = ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret;;

+	rv = ops->askumount(ap->logopt, ap->ioctlfd, &ret;;

 	if (rv == -1) {

 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

 		logerr("ioctl failed: %s", estr);

@@ -258,8 +258,8 @@ int umount_autofs_indirect(struct autofs

 		return 1;

 	}

-	ioctl(ap->ioctlfd, AUTOFS_IOC_CATATONIC, 0);

-	close(ap->ioctlfd);

+	ops->catatonic(ap->logopt, ap->ioctlfd);

+	ops->close(ap->logopt, ap->ioctlfd);

 	ap->ioctlfd = -1;

 	close(ap->state_pipe[0]);

 	close(ap->state_pipe[1]);

@@ -320,48 +320,6 @@ force_umount:

 	return rv;

 }

-static int expire_indirect(struct autofs_point *ap, int ioctlfd, const char *path, unsigned int when)

-{

-	char buf[MAX_ERR_BUF];

-	int ret, retries;

-	struct stat st;

-

-	if (fstat(ioctlfd, &st) == -1) {

-		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

-		debug(ap->logopt, "fstat failed: %s", estr);

-		return 0;

-	}

-

-	retries = (count_mounts(ap->logopt, path, st.st_dev) + 1) * EXPIRE_RETRIES;

-

-	while (retries--) {

-		struct timespec tm = {0, 100000000};

-

-		/* Ggenerate expire message for the mount. */

-		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &when);

-		if (ret == -1) {

-			/* Mount has gone away */

-			if (errno == EBADF || errno == EINVAL)

-				return 1;

-

-			/*

-			 * Other than EAGAIN is an expire error so continue.

-			 * Kernel will try the next mount.

-			 */

-			if (errno == EAGAIN)

-				break;

-		}

-		nanosleep(&tm, NULL);

-	}

-

-	if (!ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {

-		if (!ret)

-			return 0;

-	}

-

-	return 1;

-}

-

 static void mnts_cleanup(void *arg)

 {

 	struct mnt_list *mnts = (struct mnt_list *) arg;

@@ -371,6 +329,7 @@ static void mnts_cleanup(void *arg)

 void *expire_proc_indirect(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct autofs_point *ap;

 	struct mapent *me = NULL;

 	struct mnt_list *mnts = NULL, *next;

@@ -458,8 +417,8 @@ void *expire_proc_indirect(void *arg)

 		debug(ap->logopt, "expire %s", next->path);

 		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);

-		ret = expire_indirect(ap, ioctlfd, next->path, now);

-		if (!ret)

+		ret = ops->expire(ap->logopt, ioctlfd, next->path, now);

+		if (ret)

 			left++;

 		pthread_setcancelstate(cur_state, NULL);

 	}

@@ -472,8 +431,8 @@ void *expire_proc_indirect(void *arg)

 	 */

 	if (mnts) {

 		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);

-		ret = expire_indirect(ap, ap->ioctlfd, ap->path, now);

-		if (!ret)

+		ret = ops->expire(ap->logopt, ap->ioctlfd, ap->path, now);

+		if (ret)

 			left++;

 		pthread_setcancelstate(cur_state, NULL);

 	}

@@ -495,8 +454,8 @@ void *expire_proc_indirect(void *arg)

 	pthread_cleanup_pop(1);

 	if (submnts)

-		debug(ap->logopt,

-		      "%d submounts remaining in %s", submnts, ap->path);

+		info(ap->logopt,

+		     "%d submounts remaining in %s", submnts, ap->path);

 	/* 

 	 * EXPIRE_MULTI is synchronous, so we can be sure (famous last

@@ -527,8 +486,11 @@ static void pending_cond_destroy(void *a

 static void expire_send_fail(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt = arg;

-	send_fail(mt->ap->logopt, mt->ap->ioctlfd, mt->wait_queue_token);

+	struct autofs_point *ap = mt->ap;

+	ops->send_fail(ap->logopt,

+		       ap->ioctlfd, mt->wait_queue_token, -ENOENT);

 }

 static void free_pending_args(void *arg)

@@ -546,6 +508,7 @@ static void expire_mutex_unlock(void *ar

 static void *do_expire_indirect(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt;

 	struct autofs_point *ap;

 	int status, state;

@@ -572,9 +535,11 @@ static void *do_expire_indirect(void *ar

 	status = do_expire(mt->ap, mt->name, mt->len);

 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);

 	if (status)

-		send_fail(ap->logopt, ap->ioctlfd, mt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       ap->ioctlfd, mt->wait_queue_token, -status);

 	else

-		send_ready(ap->logopt, ap->ioctlfd, mt->wait_queue_token);

+		ops->send_ready(ap->logopt,

+				ap->ioctlfd, mt->wait_queue_token);

 	pthread_setcancelstate(state, NULL);

 	pthread_cleanup_pop(0);

@@ -586,6 +551,7 @@ static void *do_expire_indirect(void *ar

 int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_indirect_t *pkt)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt;

 	char buf[MAX_ERR_BUF];

 	pthread_t thid;

@@ -600,7 +566,8 @@ int handle_packet_expire_indirect(struct

 	if (!mt) {

 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

 		logerr("malloc: %s", estr);

-		send_fail(ap->logopt, ap->ioctlfd, pkt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       ap->ioctlfd, pkt->wait_queue_token, -ENOMEM);

 		pthread_setcancelstate(state, NULL);

 		return 1;

 	}

@@ -622,7 +589,8 @@ int handle_packet_expire_indirect(struct

 	status = pthread_create(&thid, &thread_attr, do_expire_indirect, mt);

 	if (status) {

 		error(ap->logopt, "expire thread create failed");

-		send_fail(ap->logopt, ap->ioctlfd, pkt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       ap->ioctlfd, pkt->wait_queue_token, -status);

 		expire_mutex_unlock(NULL);

 		pending_cond_destroy(mt);

 		free_pending_args(mt);

@@ -647,8 +615,11 @@ int handle_packet_expire_indirect(struct

 static void mount_send_fail(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt = arg;

-	send_fail(mt->ap->logopt, mt->ap->ioctlfd, mt->wait_queue_token);

+	struct autofs_point *ap = mt->ap;

+	ops->send_fail(ap->logopt,

+		       ap->ioctlfd, mt->wait_queue_token, -ENOENT);

 }

 static void mount_mutex_unlock(void *arg)

@@ -660,6 +631,7 @@ static void mount_mutex_unlock(void *arg

 static void *do_mount_indirect(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt;

 	struct autofs_point *ap;

 	char buf[PATH_MAX + 1];

@@ -837,10 +809,13 @@ cont:

 	status = lookup_nss_mount(ap, NULL, mt->name, mt->len);

 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);

 	if (status) {

-		send_ready(ap->logopt, ap->ioctlfd, mt->wait_queue_token);

+		ops->send_ready(ap->logopt,

+				ap->ioctlfd, mt->wait_queue_token);

 		info(ap->logopt, "mounted %s", buf);

 	} else {

-		send_fail(ap->logopt, ap->ioctlfd, mt->wait_queue_token);

+		/* TODO: get mount return status from lookup_nss_mount */

+		ops->send_fail(ap->logopt,

+			       ap->ioctlfd, mt->wait_queue_token, -ENOENT);

 		info(ap->logopt, "failed to mount %s", buf);

 	}

 	pthread_setcancelstate(state, NULL);

@@ -854,6 +829,7 @@ cont:

 int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missing_indirect_t *pkt)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	pthread_t thid;

 	char buf[MAX_ERR_BUF];

 	struct pending_args *mt;

@@ -868,7 +844,8 @@ int handle_packet_missing_indirect(struc

 	if (ap->shutdown ||

 	    ap->state == ST_SHUTDOWN_FORCE ||

 	    ap->state == ST_SHUTDOWN) {

-		send_fail(ap->logopt, ap->ioctlfd, pkt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       ap->ioctlfd, pkt->wait_queue_token, -ENOENT);

 		pthread_setcancelstate(state, NULL);

 		return 0;

 	}

@@ -877,7 +854,8 @@ int handle_packet_missing_indirect(struc

 	if (!mt) {

 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

 		logerr("malloc: %s", estr);

-		send_fail(ap->logopt, ap->ioctlfd, pkt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       ap->ioctlfd, pkt->wait_queue_token, -ENOMEM);

 		pthread_setcancelstate(state, NULL);

 		return 1;

 	}

@@ -903,7 +881,8 @@ int handle_packet_missing_indirect(struc

 	status = pthread_create(&thid, &thread_attr, do_mount_indirect, mt);

 	if (status) {

 		error(ap->logopt, "expire thread create failed");

-		send_fail(ap->logopt, ap->ioctlfd, pkt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       ap->ioctlfd, pkt->wait_queue_token, -status);

 		mount_mutex_unlock(NULL);

 		pending_cond_destroy(mt);

 		free_pending_args(mt);

diff -up autofs-5.0.3/daemon/state.c.device-node-control autofs-5.0.3/daemon/state.c

--- autofs-5.0.3/daemon/state.c.device-node-control	2008-01-14 13:39:16.000000000 +0900

+++ autofs-5.0.3/daemon/state.c	2008-02-25 09:03:12.000000000 +0900

@@ -93,6 +93,7 @@ void nextstate(int statefd, enum states 

  */

 void expire_cleanup(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	pthread_t thid = pthread_self();

 	struct expire_args *ec;

 	struct autofs_point *ap;

@@ -113,7 +114,8 @@ void expire_cleanup(void *arg)

 	/* Check to see if expire process finished */

 	if (thid == ap->exp_thread) {

-		int rv, idle;

+		unsigned int idle;

+		int rv;

 		ap->exp_thread = 0;

@@ -135,7 +137,7 @@ void expire_cleanup(void *arg)

 			 * allowing it to shutdown.

 			 */

 			if (ap->submount && !success) {

-				rv = ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &idle);

+				rv = ops->askumount(ap->logopt, ap->ioctlfd, &idle);

 				if (!rv && idle && ap->submount > 1) {

 					next = ST_SHUTDOWN_PENDING;

 					break;

@@ -160,7 +162,7 @@ void expire_cleanup(void *arg)

 			 * shutdown return to ready state unless we have

 			 * been signaled to shutdown.

 			 */

-			rv = ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &idle);

+			rv = ops->askumount(ap->logopt, ap->ioctlfd, &idle);

 			if (!idle && !ap->shutdown) {

 				next = ST_READY;

 				if (!ap->submount)

diff -up autofs-5.0.3/daemon/lookup.c.device-node-control autofs-5.0.3/daemon/lookup.c

--- autofs-5.0.3/daemon/lookup.c.device-node-control	2008-01-14 13:39:16.000000000 +0900

+++ autofs-5.0.3/daemon/lookup.c	2008-02-25 09:03:12.000000000 +0900

@@ -1148,7 +1148,8 @@ int lookup_source_close_ioctlfd(struct a

 		me = cache_lookup_distinct(mc, key);

 		if (me) {

 			if (me->ioctlfd != -1) {

-				close(me->ioctlfd);

+				struct ioctl_ops *ops = get_ioctl_ops();

+				ops->close(ap->logopt, me->ioctlfd);

 				me->ioctlfd = -1;

 			}

 			cache_unlock(mc);

diff -up autofs-5.0.3/daemon/direct.c.device-node-control autofs-5.0.3/daemon/direct.c

--- autofs-5.0.3/daemon/direct.c.device-node-control	2008-02-25 08:58:46.000000000 +0900

+++ autofs-5.0.3/daemon/direct.c	2008-02-25 09:03:12.000000000 +0900

@@ -42,6 +42,9 @@

 extern pthread_attr_t thread_attr;

+static const unsigned int direct = AUTOFS_TYPE_DIRECT;

+static const unsigned int offset = AUTOFS_TYPE_OFFSET;

+

 struct mnt_params {

 	char *options;

 };

@@ -88,6 +91,7 @@ static void mnts_cleanup(void *arg)

 int do_umount_autofs_direct(struct autofs_point *ap, struct mnt_list *mnts, struct mapent *me)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	char buf[MAX_ERR_BUF];

 	int ioctlfd, rv, left, retries;

@@ -106,23 +110,13 @@ int do_umount_autofs_direct(struct autof

 			return 1;

 		}

 		ioctlfd = me->ioctlfd;

-	} else {

-		int cl_flags;

-

-		ioctlfd = open(me->key, O_RDONLY);

-		if (ioctlfd != -1) {

-			if ((cl_flags = fcntl(ioctlfd, F_GETFD, 0)) != -1) {

-				cl_flags |= FD_CLOEXEC;

-				fcntl(ioctlfd, F_SETFD, cl_flags);

-			}

-		}

-	}

-

+	} else

+		ops->open(ap->logopt, &ioctlfd, -1, me->key, direct);

 	if (ioctlfd >= 0) {

-		int status = 1;

+		unsigned int status = 1;

-		rv = ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &status);

+		rv = ops->askumount(ap->logopt, ioctlfd, &status);

 		if (rv) {

 			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

 			error(ap->logopt, "ioctl failed: %s", estr);

@@ -135,19 +129,17 @@ int do_umount_autofs_direct(struct autof

 				return 1;

 			} else {

 				me->ioctlfd = -1;

-				ioctl(ioctlfd, AUTOFS_IOC_CATATONIC, 0);

-				close(ioctlfd);

+				ops->catatonic(ap->logopt, ioctlfd);

+				ops->close(ap->logopt, ioctlfd);

 				goto force_umount;

 			}

 		}

 		me->ioctlfd = -1;

-		ioctl(ioctlfd, AUTOFS_IOC_CATATONIC, 0);

-		close(ioctlfd);

+		ops->catatonic(ap->logopt, ioctlfd);

+		ops->close(ap->logopt, ioctlfd);

 	} else {

-		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

 		error(ap->logopt,

 		      "couldn't get ioctl fd for direct mount %s", me->key);

-		debug(ap->logopt, "open: %s", estr);

 		return 1;

 	}

@@ -297,10 +289,11 @@ static int unlink_mount_tree(struct auto

 int do_mount_autofs_direct(struct autofs_point *ap, struct mnt_list *mnts, struct mapent *me)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct mnt_params *mp;

 	time_t timeout = ap->exp_timeout;

 	struct stat st;

-	int status, ret, ioctlfd, cl_flags;

+	int status, ret, ioctlfd;

 	struct list_head list;

 	const char *map_name;

@@ -313,16 +306,8 @@ int do_mount_autofs_direct(struct autofs

 			save_ioctlfd = ioctlfd = me->ioctlfd;

-			if (ioctlfd == -1) {

-				ioctlfd = open(me->key, O_RDONLY);

-				if (ioctlfd != -1) {

-					cl_flags = fcntl(ioctlfd, F_GETFD, 0);

-					if (cl_flags != -1) {

-						cl_flags |= FD_CLOEXEC;

-						fcntl(ioctlfd, F_SETFD, cl_flags);

-					}

-				}

-			}

+			if (ioctlfd == -1)

+				ops->open(ap->logopt, &ioctlfd, -1, me->key, direct);

 			if (ioctlfd < 0) {

 				error(ap->logopt,

@@ -331,13 +316,14 @@ int do_mount_autofs_direct(struct autofs

 				return 0;

 			}

-			ioctl(ioctlfd, AUTOFS_IOC_SETTIMEOUT, &tout);

+			ops->timeout(ap->logopt, ioctlfd, &tout);

 			if (save_ioctlfd == -1)

-				close(ioctlfd);

+				ops->close(ap->logopt, ioctlfd);

 			return 0;

 		}

+

 		if (!unlink_mount_tree(ap, &list)) {

 			debug(ap->logopt,

 			      "already mounted as other than autofs "

@@ -402,22 +388,16 @@ int do_mount_autofs_direct(struct autofs

 		goto out_err;

 	}

-	/* Root directory for ioctl()'s */

-	ioctlfd = open(me->key, O_RDONLY);

+	ops->open(ap->logopt, &ioctlfd, -1, me->key, direct);

 	if (ioctlfd < 0) {

 		crit(ap->logopt, "failed to create ioctl fd for %s", me->key);

 		goto out_umount;

 	}

-	if ((cl_flags = fcntl(ioctlfd, F_GETFD, 0)) != -1) {

-		cl_flags |= FD_CLOEXEC;

-		fcntl(ioctlfd, F_SETFD, cl_flags);

-	}

-

 	/* Calculate the timeouts */

 	ap->exp_runfreq = (timeout + CHECK_RATIO - 1) / CHECK_RATIO;

-	ioctl(ioctlfd, AUTOFS_IOC_SETTIMEOUT, &timeout);

+	ops->timeout(ap->logopt, ioctlfd, &timeout);

 	if (ap->exp_timeout)

 		info(ap->logopt,

@@ -438,14 +418,14 @@ int do_mount_autofs_direct(struct autofs

 	}

 	cache_set_ino_index(me->mc, me->key, st.st_dev, st.st_ino);

-	close(ioctlfd);

+	ops->close(ap->logopt, ioctlfd);

 	debug(ap->logopt, "mounted trigger %s", me->key);

 	return 0;

 out_close:

-	close(ioctlfd);

+	ops->close(ap->logopt, ioctlfd);

 out_umount:

 	/* TODO: maybe force umount (-l) */

 	umount(me->key);

@@ -537,8 +517,9 @@ int mount_autofs_direct(struct autofs_po

 int umount_autofs_offset(struct autofs_point *ap, struct mapent *me)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	char buf[MAX_ERR_BUF];

-	int ioctlfd, cl_flags, rv = 1, retries;

+	int ioctlfd, rv = 1, retries;

 	if (me->ioctlfd != -1) {

 		if (is_mounted(_PATH_MOUNTED, me->key, MNTS_REAL)) {

@@ -555,20 +536,13 @@ int umount_autofs_offset(struct autofs_p

 			      me->key);

 			return 0;

 		}

-

-		ioctlfd = open(me->key, O_RDONLY);

-		if (ioctlfd != -1) {

-			if ((cl_flags = fcntl(ioctlfd, F_GETFD, 0)) != -1) {

-				cl_flags |= FD_CLOEXEC;

-				fcntl(ioctlfd, F_SETFD, cl_flags);

-			}

-		}

+		ops->open(ap->logopt, &ioctlfd, -1, me->key, offset);

 	}

 	if (ioctlfd >= 0) {

-		int status = 1;

+		unsigned int status = 1;

-		rv = ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &status);

+		rv = ops->askumount(ap->logopt, ioctlfd, &status);

 		if (rv) {

 			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

 			logerr("ioctl failed: %s", estr);

@@ -581,14 +555,14 @@ int umount_autofs_offset(struct autofs_p

 				return 1;

 			} else {

 				me->ioctlfd = -1;

-				ioctl(ioctlfd, AUTOFS_IOC_CATATONIC, 0);

-				close(ioctlfd);

+				ops->catatonic(ap->logopt, ioctlfd);

+				ops->close(ap->logopt, ioctlfd);

 				goto force_umount;

 			}

 		}

 		me->ioctlfd = -1;

-		ioctl(ioctlfd, AUTOFS_IOC_CATATONIC, 0);

-		close(ioctlfd);

+		ops->catatonic(ap->logopt, ioctlfd);

+		ops->close(ap->logopt, ioctlfd);

 	} else {

 		struct stat st;

 		char *estr;

@@ -653,11 +627,12 @@ force_umount:

 int mount_autofs_offset(struct autofs_point *ap, struct mapent *me)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	char buf[MAX_ERR_BUF];

 	struct mnt_params *mp;

 	time_t timeout = ap->exp_timeout;

 	struct stat st;

-	int ioctlfd, cl_flags, status, ret;

+	int ioctlfd, status, ret;

 	const char *type, *map_name = NULL;

 	if (is_mounted(_PROC_MOUNTS, me->key, MNTS_AUTOFS)) {

@@ -760,19 +735,13 @@ int mount_autofs_offset(struct autofs_po

 		goto out_err;

 	}

-	/* Root directory for ioctl()'s */

-	ioctlfd = open(me->key, O_RDONLY);

+	ops->open(ap->logopt, &ioctlfd, -1, me->key, offset);

 	if (ioctlfd < 0) {

 		crit(ap->logopt, "failed to create ioctl fd for %s", me->key);

 		goto out_umount;

 	}

-	if ((cl_flags = fcntl(ioctlfd, F_GETFD, 0)) != -1) {

-		cl_flags |= FD_CLOEXEC;

-		fcntl(ioctlfd, F_SETFD, cl_flags);

-	}

-

-	ioctl(ioctlfd, AUTOFS_IOC_SETTIMEOUT, &timeout);

+	ops->timeout(ap->logopt, ioctlfd, &timeout);

 	ret = fstat(ioctlfd, &st);

 	if (ret == -1) {

@@ -783,14 +752,14 @@ int mount_autofs_offset(struct autofs_po

 	cache_set_ino_index(me->mc, me->key, st.st_dev, st.st_ino);

-	close(ioctlfd);

+	ops->close(ap->logopt, ioctlfd);

 	debug(ap->logopt, "mounted trigger %s", me->key);

 	return 0;

 out_close:

-	close(ioctlfd);

+	ops->close(ap->logopt, ioctlfd);

 out_umount:

 	umount(me->key);

 out_err:

@@ -800,53 +769,9 @@ out_err:

 	return -1;

 }

-static int expire_direct(int ioctlfd, const char *path, unsigned int when, unsigned int logopt)

-{

-	char buf[MAX_ERR_BUF];

-	int ret, retries;

-	struct stat st;

-

-	if (fstat(ioctlfd, &st) == -1) {

-		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

-		debug(logopt, "fstat failed: %s", estr);

-		return 0;

-	}

-

-	retries = (count_mounts(logopt, path, st.st_dev) + 1) * EXPIRE_RETRIES;

-

-	while (retries--) {

-		struct timespec tm = {0, 100000000};

-

-		/* Ggenerate expire message for the mount. */

-		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &when);

-		if (ret == -1) {

-			/* Mount has gone away */

-			if (errno == EBADF || errno == EINVAL)

-				return 1;

-

-			/*

-			 * Other than EAGAIN is an expire error so continue.

-			 * Kernel try the same mount again, limited by

-			 * retries (ie. number of mounts directly under

-			 * mount point, should always be one for direct

-			 * mounts).

-			 */

-			if (errno == EAGAIN)

-				break;

-		}

-		nanosleep(&tm, NULL);

-	}

-

-	if (!ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {

-		if (!ret)

-			return 0;

-	}

-

-	return 1;

-}

-

 void *expire_proc_direct(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct mnt_list *mnts = NULL, *next;

 	struct list_head list, *p;

 	struct expire_args *ea;

@@ -958,8 +883,8 @@ void *expire_proc_direct(void *arg)

 			ioctlfd = me->ioctlfd;

-			ret = expire_direct(ioctlfd, next->path, now, ap->logopt);

-			if (!ret) {

+			ret = ops->expire(ap->logopt, ioctlfd, next->path, now);

+			if (ret) {

 				left++;

 				pthread_setcancelstate(cur_state, NULL);

 				continue;

@@ -991,8 +916,8 @@ void *expire_proc_direct(void *arg)

 		debug(ap->logopt, "send expire to trigger %s", next->path);

 		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);

-		ret = expire_direct(ioctlfd, next->path, now, ap->logopt);

-		if (!ret)

+		ret = ops->expire(ap->logopt, ioctlfd, next->path, now);

+		if (ret)

 			left++;

 		pthread_setcancelstate(cur_state, NULL);

 	}

@@ -1023,8 +948,11 @@ static void pending_cond_destroy(void *a

 static void expire_send_fail(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt = arg;

-	send_fail(mt->ap->logopt, mt->ioctlfd, mt->wait_queue_token);

+	struct autofs_point *ap = mt->ap;

+	ops->send_fail(ap->logopt,

+		       mt->ioctlfd, mt->wait_queue_token, -ENOENT);

 }

 static void free_pending_args(void *arg)

@@ -1042,6 +970,7 @@ static void expire_mutex_unlock(void *ar

 static void *do_expire_direct(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt;

 	struct autofs_point *ap;

 	size_t len;

@@ -1076,15 +1005,16 @@ static void *do_expire_direct(void *arg)

 	status = do_expire(ap, mt->name, len);

 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);

 	if (status)

-		send_fail(ap->logopt, mt->ioctlfd, mt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       mt->ioctlfd, mt->wait_queue_token, -ENOENT);

 	else {

 		struct mapent *me;

 		cache_readlock(mt->mc);

 		me = cache_lookup_distinct(mt->mc, mt->name);

 		me->ioctlfd = -1;

 		cache_unlock(mt->mc);

-		send_ready(ap->logopt, mt->ioctlfd, mt->wait_queue_token);

-		close(mt->ioctlfd);

+		ops->send_ready(ap->logopt, mt->ioctlfd, mt->wait_queue_token);

+		ops->close(ap->logopt, mt->ioctlfd);

 	}

 	pthread_setcancelstate(state, NULL);

@@ -1097,6 +1027,7 @@ static void *do_expire_direct(void *arg)

 int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_direct_t *pkt)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct map_source *map;

 	struct mapent_cache *mc = NULL;

 	struct mapent *me = NULL;

@@ -1146,7 +1077,8 @@ int handle_packet_expire_direct(struct a

 	if (!mt) {

 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);

 		error(ap->logopt, "malloc: %s", estr);

-		send_fail(ap->logopt, me->ioctlfd, pkt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       me->ioctlfd, pkt->wait_queue_token, -ENOMEM);

 		cache_unlock(mc);

 		pthread_setcancelstate(state, NULL);

 		return 1;

@@ -1175,7 +1107,8 @@ int handle_packet_expire_direct(struct a

 	status = pthread_create(&thid, &thread_attr, do_expire_direct, mt);

 	if (status) {

 		error(ap->logopt, "expire thread create failed");

-		send_fail(ap->logopt, mt->ioctlfd, pkt->wait_queue_token);

+		ops->send_fail(ap->logopt,

+			       mt->ioctlfd, pkt->wait_queue_token, -status);

 		cache_unlock(mc);

 		expire_mutex_unlock(NULL);

 		pending_cond_destroy(mt);

@@ -1203,9 +1136,11 @@ int handle_packet_expire_direct(struct a

 static void mount_send_fail(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt = arg;

-	send_fail(mt->ap->logopt, mt->ioctlfd, mt->wait_queue_token);

-	close(mt->ioctlfd);

+	struct autofs_point *ap = mt->ap;

+	ops->send_fail(ap->logopt, mt->ioctlfd, mt->wait_queue_token, -ENOENT);

+	ops->close(ap->logopt, mt->ioctlfd);

 }

 static void mount_mutex_unlock(void *arg)

@@ -1217,6 +1152,7 @@ static void mount_mutex_unlock(void *arg

 static void *do_mount_direct(void *arg)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct pending_args *mt;

 	struct autofs_point *ap;

 	struct passwd pw;

@@ -1409,15 +1345,19 @@ cont:

 		cache_unlock(mt->mc);

 		if (set_fd) {

 			me->ioctlfd = mt->ioctlfd;

-			send_ready(ap->logopt, mt->ioctlfd, mt->wait_queue_token);

+			ops->send_ready(ap->logopt,

+					mt->ioctlfd, mt->wait_queue_token);

 		} else {

-			send_ready(ap->logopt, mt->ioctlfd, mt->wait_queue_token);

-			close(mt->ioctlfd);

+			ops->send_ready(ap->logopt,

+					mt->ioctlfd, mt->wait_queue_token);

+			ops->close(ap->logopt, mt->ioctlfd);

 		}

 		info(ap->logopt, "mounted %s", mt->name);

 	} else {

-		send_fail(mt->ap->logopt, mt->ioctlfd, mt->wait_queue_token);

-		close(mt->ioctlfd);

+		/* TODO: get mount return status from lookup_nss_mount */

+		ops->send_fail(ap->logopt,

+			       mt->ioctlfd, mt->wait_queue_token, -ENOENT);

+		ops->close(ap->logopt, mt->ioctlfd);

 		info(ap->logopt, "failed to mount %s", mt->name);

 	}

 	pthread_setcancelstate(state, NULL);

@@ -1431,6 +1371,7 @@ cont:

 int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_direct_t *pkt)

 {

+	struct ioctl_ops *ops = get_ioctl_ops();

 	struct map_source *map;

 	struct mapent_cache *mc = NULL;

 	struct mapent *me = NULL;

@@ -1438,7 +1379,8 @@ int handle_packet_missing_direct(struct 

 	struct pending_args *mt;

 	char buf[MAX_ERR_BUF];

 	int status = 0;

-	int ioctlfd, cl_flags, state;

+	int ioctlfd, state;

+	unsigned int type;

 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);

@@ -1475,12 +1417,16 @@ int handle_packet_missing_direct(struct 

 		return 1;

 	}

+	type = direct;

+	if (me->multi != me && !list_empty(&me->multi_list))

+		type = offset;

+

 	if (me->ioctlfd != -1) {

 		/* Maybe someone did a manual umount, clean up ! */

 		ioctlfd = me->ioctlfd;