Due to planned changes to locking for the path walking the autofs module could easily deadlock during mount request callback. Since the autofs4 module provides the needed support and a patch series to overcome the locking change has been done, rather than attempt to fix autofs I propose that the autofs module be replaced by the autofs4 module. To try and give people some warning before actually removing the autofs4 directory I've left that in place, updated the Kconfig help text to warn of the impending removal, and provided a make that builds into the autofs4 directory from the updated autofs directory source. The net result is that fs/autofs/autofs.ko and fs/autofs4/autofs4.ko will be built from the same source. Also, the defconfig configurations have not yet been changed but that can be done upon actual removal. Comments on this appraoch and the patch series are welcome. --- Ian Kent (3): autofs - use consistent function naming autofs - rename autofs4 module to autofs autofs4 - coding style fixes fs/autofs/Kconfig | 12 fs/autofs/Makefile | 2 fs/autofs/autofs_i.h | 317 +++++++++--- fs/autofs/dev-ioctl.c | 766 +++++++++++++++++++++++++++++ fs/autofs/dirhash.c | 250 --------- fs/autofs/expire.c | 531 ++++++++++++++++++++ fs/autofs/init.c | 30 - fs/autofs/inode.c | 406 +++++++++++---- fs/autofs/root.c | 1268 ++++++++++++++++++++++++++++++++++-------------- fs/autofs/symlink.c | 10 fs/autofs/waitq.c | 474 +++++++++++++++--- fs/autofs4/Kconfig | 10 fs/autofs4/Makefile | 10 fs/autofs4/autofs_i.h | 304 ------------ fs/autofs4/dev-ioctl.c | 765 ----------------------------- fs/autofs4/expire.c | 530 -------------------- fs/autofs4/init.c | 51 -- fs/autofs4/inode.c | 473 ------------------ fs/autofs4/root.c | 1109 ------------------------------------------ fs/autofs4/symlink.c | 25 - fs/autofs4/waitq.c | 524 -------------------- 21 files changed, 3157 insertions(+), 4710 deletions(-) create mode 100644 fs/autofs/dev-ioctl.c delete mode 100644 fs/autofs/dirhash.c create mode 100644 fs/autofs/expire.c delete mode 100644 fs/autofs4/autofs_i.h delete mode 100644 fs/autofs4/dev-ioctl.c delete mode 100644 fs/autofs4/expire.c delete mode 100644 fs/autofs4/init.c delete mode 100644 fs/autofs4/inode.c delete mode 100644 fs/autofs4/root.c delete mode 100644 fs/autofs4/symlink.c delete mode 100644 fs/autofs4/waitq.c -- Ian -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html