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

Commit 24c30470 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

* 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (28 commits)
  pnfsblock: write_pagelist handle zero invalid extents
  pnfsblock: note written INVAL areas for layoutcommit
  pnfsblock: bl_write_pagelist
  pnfsblock: bl_read_pagelist
  pnfsblock: cleanup_layoutcommit
  pnfsblock: encode_layoutcommit
  pnfsblock: merge rw extents
  pnfsblock: add extent manipulation functions
  pnfsblock: bl_find_get_extent
  pnfsblock: xdr decode pnfs_block_layout4
  pnfsblock: call and parse getdevicelist
  pnfsblock: merge extents
  pnfsblock: lseg alloc and free
  pnfsblock: remove device operations
  pnfsblock: add device operations
  pnfsblock: basic extent code
  pnfsblock: use pageio_ops api
  pnfsblock: add blocklayout Kconfig option, Makefile, and stubs
  pnfs: cleanup_layoutcommit
  pnfs: ask for layout_blksize and save it in nfs_server
  ...
parents 6581058f 71cdd40f

fs/nfs/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -79,15 +79,21 @@ config NFS_V4_1 
	depends on NFS_FS && NFS_V4 && EXPERIMENTAL

	select SUNRPC_BACKCHANNEL

	select PNFS_FILE_LAYOUT

	select PNFS_BLOCK

	select MD

	select BLK_DEV_DM

	help

	  This option enables support for minor version 1 of the NFSv4 protocol

	  (RFC 5661) in the kernel's NFS client.

	  (RFC 5661 and RFC 5663) in the kernel's NFS client.



	  If unsure, say N.



config PNFS_FILE_LAYOUT

	tristate



config PNFS_BLOCK

	tristate



config PNFS_OBJLAYOUT

	tristate "Provide support for the pNFS Objects Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)"

	depends on NFS_FS && NFS_V4_1 && SCSI_OSD_ULD

fs/nfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -23,3 +23,4 @@ obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o 
nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o



obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayout/

obj-$(CONFIG_PNFS_BLOCK) += blocklayout/

fs/nfs/blocklayout/Makefile

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

# Makefile for the pNFS block layout driver kernel module

#

obj-$(CONFIG_PNFS_BLOCK) += blocklayoutdriver.o

blocklayoutdriver-objs := blocklayout.o extents.o blocklayoutdev.o blocklayoutdm.o