Skip to contentSkip to conversation

autofs3: move to drivers/staging

RFC PATCH In review Arnd Bergmann 3 participants 4 messages Oct 4, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 autofs3: move to drivers/staging

Nobody appears to be interested in fixing autofs3 bugs any more and it uses the BKL, which is going away.

Move this to staging for retirement. Unless someone complains until 2.6.38, we can remove it for good.

The include/linux/auto_fs.h header file is still used by autofs4, so it remains in place.

---
 MAINTAINERS                               |    4 ++--
 drivers/staging/Kconfig                   |    2 ++
 drivers/staging/Makefile                  |    1 +
 {fs => drivers/staging}/autofs/Kconfig    |    0
 {fs => drivers/staging}/autofs/Makefile   |    0
 {fs => drivers/staging}/autofs/autofs_i.h |    2 +-
 {fs => drivers/staging}/autofs/dirhash.c  |    2 +-
 {fs => drivers/staging}/autofs/init.c     |    2 +-
 {fs => drivers/staging}/autofs/inode.c    |    2 +-
 {fs => drivers/staging}/autofs/root.c     |    2 +-
 {fs => drivers/staging}/autofs/symlink.c  |    2 +-
 {fs => drivers/staging}/autofs/waitq.c    |    2 +-
 fs/Kconfig                                |    1 -
 fs/Makefile                               |    1 -
 14 files changed, 12 insertions(+), 11 deletions(-)
 rename {fs => drivers/staging}/autofs/Kconfig (100%)
 rename {fs => drivers/staging}/autofs/Makefile (100%)
 rename {fs => drivers/staging}/autofs/autofs_i.h (99%)
 rename {fs => drivers/staging}/autofs/dirhash.c (99%)
 rename {fs => drivers/staging}/autofs/init.c (97%)
 rename {fs => drivers/staging}/autofs/inode.c (99%)
 rename {fs => drivers/staging}/autofs/root.c (99%)
 rename {fs => drivers/staging}/autofs/symlink.c (95%)
 rename {fs => drivers/staging}/autofs/waitq.c (99%)
MAINTAINERS +2 -2
index a3f9786..0d675a9 100644
@@ -3314,8 +3314,8 @@ F:	Documentation/kdump/
 KERNEL AUTOMOUNTER (AUTOFS)
 M:	"H. Peter Anvin" <[email protected]>
 L:	[email protected]
-S:	Odd Fixes
-F:	fs/autofs/
+S:	Obsolete
+F:	drivers/staging/autofs/
 
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:	Ian Kent <[email protected]>
drivers/staging/Kconfig +2 -0
index e8edba7..0150353 100644
@@ -87,6 +87,8 @@ source "drivers/staging/dream/Kconfig"
 
 source "drivers/staging/pohmelfs/Kconfig"
 
+source "drivers/staging/autofs/Kconfig"
+
 source "drivers/staging/phison/Kconfig"
 
 source "drivers/staging/line6/Kconfig"
drivers/staging/Makefile +1 -0
index d8eeea4..de5c0e5 100644
@@ -28,6 +28,7 @@ obj-$(CONFIG_SPECTRA)		+= spectra/
 obj-$(CONFIG_TRANZPORT)		+= frontier/
 obj-$(CONFIG_DREAM)		+= dream/
 obj-$(CONFIG_POHMELFS)		+= pohmelfs/
+obj-$(CONFIG_AUTOFS_FS)		+= autofs/
 obj-$(CONFIG_IDE_PHISON)	+= phison/
 obj-$(CONFIG_LINE6_USB)		+= line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH2)	+= serqt_usb2/
drivers/staging/autofs/Kconfig renamed from fs/autofs/Kconfig +0 -0
similarity index 100%
rename from fs/autofs/Kconfig
rename to drivers/staging/autofs/Kconfig
drivers/staging/autofs/Makefile renamed from fs/autofs/Makefile +0 -0
similarity index 100%
rename from fs/autofs/Makefile
rename to drivers/staging/autofs/Makefile
drivers/staging/autofs/autofs_i.h renamed from fs/autofs/autofs_i.h +1 -1
similarity index 99%
rename from fs/autofs/autofs_i.h
rename to drivers/staging/autofs/autofs_i.h
index 901a3e6..647a143 100644
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- ------------------------------------------------------- *
  *   
- * linux/fs/autofs/autofs_i.h
+ * drivers/staging/autofs/autofs_i.h
  *
  *   Copyright 1997-1998 Transmeta Corporation - All Rights Reserved
  *
drivers/staging/autofs/dirhash.c renamed from fs/autofs/dirhash.c +1 -1
similarity index 99%
rename from fs/autofs/dirhash.c
rename to drivers/staging/autofs/dirhash.c
index e947915..8f3e2b8 100644
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/dirhash.c
+ * drivers/staging/autofs/dirhash.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
drivers/staging/autofs/init.c renamed from fs/autofs/init.c +1 -1
similarity index 97%
rename from fs/autofs/init.c
rename to drivers/staging/autofs/init.c
index cea5219..765c72f 100644
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/init.c
+ * drivers/staging/autofs/init.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
drivers/staging/autofs/inode.c renamed from fs/autofs/inode.c +1 -1
similarity index 99%
rename from fs/autofs/inode.c
rename to drivers/staging/autofs/inode.c
index e1734f2..74db190 100644
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/inode.c
+ * drivers/staging/autofs/inode.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
drivers/staging/autofs/root.c renamed from fs/autofs/root.c +1 -1
similarity index 99%
rename from fs/autofs/root.c
rename to drivers/staging/autofs/root.c
index 11b1ea7..70210aa 100644
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/root.c
+ * drivers/staging/autofs/root.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
drivers/staging/autofs/symlink.c renamed from fs/autofs/symlink.c +1 -1
similarity index 95%
rename from fs/autofs/symlink.c
rename to drivers/staging/autofs/symlink.c
index 7ce9cb2..ff2c65c 100644
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/symlink.c
+ * drivers/staging/autofs/symlink.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
drivers/staging/autofs/waitq.c renamed from fs/autofs/waitq.c +1 -1
similarity index 99%
rename from fs/autofs/waitq.c
rename to drivers/staging/autofs/waitq.c
index be46805..d3c8cc9 100644
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/waitq.c
+ * drivers/staging/autofs/waitq.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
fs/Kconfig +0 -1
index 3d18530..30da8ee 100644
@@ -59,7 +59,6 @@ source "fs/notify/Kconfig"
 
 source "fs/quota/Kconfig"
 
-source "fs/autofs/Kconfig"
 source "fs/autofs4/Kconfig"
 source "fs/fuse/Kconfig"
 
fs/Makefile +0 -1
index e6ec1d3..e571fed 100644
@@ -104,7 +104,6 @@ obj-$(CONFIG_UBIFS_FS)		+= ubifs/
 obj-$(CONFIG_AFFS_FS)		+= affs/
 obj-$(CONFIG_ROMFS_FS)		+= romfs/
 obj-$(CONFIG_QNX4FS_FS)		+= qnx4/
-obj-$(CONFIG_AUTOFS_FS)		+= autofs/
 obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/
 obj-$(CONFIG_ADFS_FS)		+= adfs/
 obj-$(CONFIG_FUSE_FS)		+= fuse/
Signature · 1 line
1.7.1
#1 lore raw
Quoted 8 lines · Arnd Bergmann

Nobody appears to be interested in fixing autofs3 bugs any more and it uses the BKL, which is going away.

Move this to staging for retirement. Unless someone complains until 2.6.38, we can remove it for good.

The include/linux/auto_fs.h header file is still used by autofs4, so it remains in place.

I say we should just delete it.

-hpa

#2 lore raw
Quoted 11 lines · H. Peter Anvin
Quoted 8 lines · Arnd Bergmann

Nobody appears to be interested in fixing autofs3 bugs any more and it uses the BKL, which is going away.

Move this to staging for retirement. Unless someone complains until 2.6.38, we can remove it for good.

The include/linux/auto_fs.h header file is still used by autofs4, so it remains in place.

I say we should just delete it.

Give it the 6 months period to phase out of the kernel, I'll handle this and if someone comes back and wants to maintain it, it can easily be added back.

thanks,

greg k-h

#3 lore raw
Quoted 8 lines · Greg KH
Quoted 7 lines · H. Peter Anvin
Quoted 6 lines · Arnd Bergmann

Nobody appears to be interested in fixing autofs3 bugs any more and it uses the BKL, which is going away.

Move this to staging for retirement. Unless someone complains until 2.6.38, we can remove it for good.

Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

The include/linux/auto_fs.h header file is still used by autofs4, so it remains in place.

I say we should just delete it.

Give it the 6 months period to phase out of the kernel, I'll handle this and if someone comes back and wants to maintain it, it can easily be added back.

OK, feel free to add my

... for both the move to staging and its eventual deletion.

-hpa