Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d22323b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Trond Myklebust
Browse files

nfs: remove the objlayout driver 



The objlayout code has been in the tree, but it's been unmaintained and
no server product for it actually ever shipped.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 260f32ad

Documentation/admin-guide/kernel-parameters.txt

+0 −6
Original line number Diff line number Diff line
@@ -2419,12 +2419,6 @@ 
			and gids from such clients.  This is intended to ease

			migration from NFSv2/v3.



	objlayoutdriver.osd_login_prog=

			[NFS] [OBJLAYOUT] sets the pathname to the program which

			is used to automatically discover and login into new

			osd-targets. Please see:

			Documentation/filesystems/pnfs.txt for more explanations



	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take

			when a NMI is triggered.

			Format: [state][,regs][,debounce][,die]

Documentation/filesystems/nfs/pnfs.txt

+0 −37
Original line number Diff line number Diff line
@@ -64,46 +64,9 @@ table which are called by the nfs-client pnfs-core to implement the 
different layout types.



Files-layout-driver code is in: fs/nfs/filelayout/.. directory

Objects-layout-driver code is in: fs/nfs/objlayout/.. directory

Blocks-layout-driver code is in: fs/nfs/blocklayout/.. directory

Flexfiles-layout-driver code is in: fs/nfs/flexfilelayout/.. directory



objects-layout setup

--------------------



As part of the full STD implementation the objlayoutdriver.ko needs, at times,

to automatically login to yet undiscovered iscsi/osd devices. For this the

driver makes up-calles to a user-mode script called *osd_login*



The path_name of the script to use is by default:

	/sbin/osd_login.

This name can be overridden by the Kernel module parameter:

	objlayoutdriver.osd_login_prog



If Kernel does not find the osd_login_prog path it will zero it out

and will not attempt farther logins. An admin can then write new value

to the objlayoutdriver.osd_login_prog Kernel parameter to re-enable it.



The /sbin/osd_login is part of the nfs-utils package, and should usually

be installed on distributions that support this Kernel version.



The API to the login script is as follows:

	Usage: $0 -u <URI> -o <OSDNAME> -s <SYSTEMID>

	Options:

		-u		target uri e.g. iscsi://<ip>:<port>

				(always exists)

				(More protocols can be defined in the future.

				 The client does not interpret this string it is

				 passed unchanged as received from the Server)

		-o		osdname of the requested target OSD

				(Might be empty)

				(A string which denotes the OSD name, there is a

				 limit of 64 chars on this string)

		-s 		systemid of the requested target OSD

				(Might be empty)

				(This string, if not empty is always an hex

				 representation of the 20 bytes osd_system_id)



blocks-layout setup

-------------------

fs/nfs/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -123,11 +123,6 @@ config PNFS_BLOCK 
	depends on NFS_V4_1 && BLK_DEV_DM

	default NFS_V4



config PNFS_OBJLAYOUT

	tristate

	depends on NFS_V4_1 && SCSI_OSD_ULD

	default NFS_V4



config PNFS_FLEXFILE_LAYOUT

	tristate

	depends on NFS_V4_1 && NFS_V3

fs/nfs/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -31,6 +31,5 @@ nfsv4-$(CONFIG_NFS_V4_1) += pnfs.o pnfs_dev.o pnfs_nfs.o 
nfsv4-$(CONFIG_NFS_V4_2)	+= nfs42proc.o



obj-$(CONFIG_PNFS_FILE_LAYOUT) += filelayout/

obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayout/

obj-$(CONFIG_PNFS_BLOCK) += blocklayout/

obj-$(CONFIG_PNFS_FLEXFILE_LAYOUT) += flexfilelayout/

fs/nfs/objlayout/Kbuild

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
#

# Makefile for the pNFS Objects Layout Driver kernel module

#

objlayoutdriver-y := objio_osd.o pnfs_osd_xdr_cli.o objlayout.o

obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayoutdriver.o