Commit cd1acdf1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd 

* 'pnfs-submit' of git://git.open-osd.org/linux-open-osd: (32 commits)
  pnfs-obj: pg_test check for max_io_size
  NFSv4.1: define nfs_generic_pg_test
  NFSv4.1: use pnfs_generic_pg_test directly by layout driver
  NFSv4.1: change pg_test return type to bool
  NFSv4.1: unify pnfs_pageio_init functions
  pnfs-obj: objlayout_encode_layoutcommit implementation
  pnfs: encode_layoutcommit
  pnfs-obj: report errors and .encode_layoutreturn Implementation.
  pnfs: encode_layoutreturn
  pnfs: layoutret_on_setattr
  pnfs: layoutreturn
  pnfs-obj: osd raid engine read/write implementation
  pnfs: support for non-rpc layout drivers
  pnfs-obj: define per-inode private structure
  pnfs: alloc and free layout_hdr layoutdriver methods
  pnfs-obj: objio_osd device information retrieval and caching
  pnfs-obj: decode layout, alloc/free lseg
  pnfs-obj: pnfs_osd XDR client implementation
  pnfs-obj: pnfs_osd XDR definitions
  pnfs-obj: objlayoutdriver module skeleton
  ...
parents fac04863 93420770

fs/nfs/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -87,6 +87,16 @@ config NFS_V4_1 
config PNFS_FILE_LAYOUT

	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

	help

	  Say M here if you want your pNFS client to support the Objects Layout Driver.

	  Requires the SCSI osd initiator library (SCSI_OSD_INITIATOR) and

	  upper level driver (SCSI_OSD_ULD).



	  If unsure, say N.



config ROOT_NFS

	bool "Root file system on NFS"

	depends on NFS_FS=y && IP_PNP

fs/nfs/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ nfs-$(CONFIG_NFS_V4) += nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o \ 
			   delegation.o idmap.o \

			   callback.o callback_xdr.o callback_proc.o \

			   nfs4namespace.o

nfs-$(CONFIG_NFS_V4_1)	+= pnfs.o

nfs-$(CONFIG_NFS_V4_1)	+= pnfs.o pnfs_dev.o

nfs-$(CONFIG_SYSCTL) += sysctl.o

nfs-$(CONFIG_NFS_FSCACHE) += fscache.o fscache-index.o



obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o

nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o



obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayout/

fs/nfs/callback.h

+17 −0
Original line number Diff line number Diff line
@@ -167,6 +167,23 @@ extern unsigned nfs4_callback_layoutrecall( 


extern void nfs4_check_drain_bc_complete(struct nfs4_session *ses);

extern void nfs4_cb_take_slot(struct nfs_client *clp);



struct cb_devicenotifyitem {

	uint32_t		cbd_notify_type;

	uint32_t		cbd_layout_type;

	struct nfs4_deviceid	cbd_dev_id;

	uint32_t		cbd_immediate;

};



struct cb_devicenotifyargs {

	int				 ndevs;

	struct cb_devicenotifyitem	 *devs;

};



extern __be32 nfs4_callback_devicenotify(

	struct cb_devicenotifyargs *args,

	void *dummy, struct cb_process_state *cps);



#endif /* CONFIG_NFS_V4_1 */

extern int check_gss_callback_principal(struct nfs_client *, struct svc_rqst *);

extern __be32 nfs4_callback_getattr(struct cb_getattrargs *args,

fs/nfs/callback_proc.c

+49 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static u32 initiate_file_draining(struct nfs_client *clp, 
	spin_lock(&ino->i_lock);

	if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags) ||

	    mark_matching_lsegs_invalid(lo, &free_me_list,

					args->cbl_range.iomode))

					&args->cbl_range))

		rv = NFS4ERR_DELAY;

	else

		rv = NFS4ERR_NOMATCHING_LAYOUT;
@@ -184,7 +184,7 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, 
		ino = lo->plh_inode;

		spin_lock(&ino->i_lock);

		set_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags);

		if (mark_matching_lsegs_invalid(lo, &free_me_list, range.iomode))

		if (mark_matching_lsegs_invalid(lo, &free_me_list, &range))

			rv = NFS4ERR_DELAY;

		list_del_init(&lo->plh_bulk_recall);

		spin_unlock(&ino->i_lock);
@@ -241,6 +241,53 @@ static void pnfs_recall_all_layouts(struct nfs_client *clp) 
	do_callback_layoutrecall(clp, &args);

}



__be32 nfs4_callback_devicenotify(struct cb_devicenotifyargs *args,

				  void *dummy, struct cb_process_state *cps)

{

	int i;

	__be32 res = 0;

	struct nfs_client *clp = cps->clp;

	struct nfs_server *server = NULL;



	dprintk("%s: -->\n", __func__);



	if (!clp) {

		res = cpu_to_be32(NFS4ERR_OP_NOT_IN_SESSION);

		goto out;

	}



	for (i = 0; i < args->ndevs; i++) {

		struct cb_devicenotifyitem *dev = &args->devs[i];



		if (!server ||

		    server->pnfs_curr_ld->id != dev->cbd_layout_type) {

			rcu_read_lock();

			list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link)

				if (server->pnfs_curr_ld &&

				    server->pnfs_curr_ld->id == dev->cbd_layout_type) {

					rcu_read_unlock();

					goto found;

				}

			rcu_read_unlock();

			dprintk("%s: layout type %u not found\n",

				__func__, dev->cbd_layout_type);

			continue;

		}



	found:

		if (dev->cbd_notify_type == NOTIFY_DEVICEID4_CHANGE)

			dprintk("%s: NOTIFY_DEVICEID4_CHANGE not supported, "

				"deleting instead\n", __func__);

		nfs4_delete_deviceid(server->pnfs_curr_ld, clp, &dev->cbd_dev_id);

	}



out:

	kfree(args->devs);

	dprintk("%s: exit with status = %u\n",

		__func__, be32_to_cpu(res));

	return res;

}



int nfs41_validate_delegation_stateid(struct nfs_delegation *delegation, const nfs4_stateid *stateid)

{

	if (delegation == NULL)

fs/nfs/callback_xdr.c

+95 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#if defined(CONFIG_NFS_V4_1)

#define CB_OP_LAYOUTRECALL_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ)

#define CB_OP_DEVICENOTIFY_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ)

#define CB_OP_SEQUENCE_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ + \

					4 + 1 + 3)

#define CB_OP_RECALLANY_RES_MAXSZ	(CB_OP_HDR_RES_MAXSZ)
@@ -284,6 +285,93 @@ out: 
	return status;

}



static

__be32 decode_devicenotify_args(struct svc_rqst *rqstp,

				struct xdr_stream *xdr,

				struct cb_devicenotifyargs *args)

{

	__be32 *p;

	__be32 status = 0;

	u32 tmp;

	int n, i;

	args->ndevs = 0;



	/* Num of device notifications */

	p = read_buf(xdr, sizeof(uint32_t));

	if (unlikely(p == NULL)) {

		status = htonl(NFS4ERR_BADXDR);

		goto out;

	}

	n = ntohl(*p++);

	if (n <= 0)

		goto out;



	args->devs = kmalloc(n * sizeof(*args->devs), GFP_KERNEL);

	if (!args->devs) {

		status = htonl(NFS4ERR_DELAY);

		goto out;

	}



	/* Decode each dev notification */

	for (i = 0; i < n; i++) {

		struct cb_devicenotifyitem *dev = &args->devs[i];



		p = read_buf(xdr, (4 * sizeof(uint32_t)) + NFS4_DEVICEID4_SIZE);

		if (unlikely(p == NULL)) {

			status = htonl(NFS4ERR_BADXDR);

			goto err;

		}



		tmp = ntohl(*p++);	/* bitmap size */

		if (tmp != 1) {

			status = htonl(NFS4ERR_INVAL);

			goto err;

		}

		dev->cbd_notify_type = ntohl(*p++);

		if (dev->cbd_notify_type != NOTIFY_DEVICEID4_CHANGE &&

		    dev->cbd_notify_type != NOTIFY_DEVICEID4_DELETE) {

			status = htonl(NFS4ERR_INVAL);

			goto err;

		}



		tmp = ntohl(*p++);	/* opaque size */

		if (((dev->cbd_notify_type == NOTIFY_DEVICEID4_CHANGE) &&

		     (tmp != NFS4_DEVICEID4_SIZE + 8)) ||

		    ((dev->cbd_notify_type == NOTIFY_DEVICEID4_DELETE) &&

		     (tmp != NFS4_DEVICEID4_SIZE + 4))) {

			status = htonl(NFS4ERR_INVAL);

			goto err;

		}

		dev->cbd_layout_type = ntohl(*p++);

		memcpy(dev->cbd_dev_id.data, p, NFS4_DEVICEID4_SIZE);

		p += XDR_QUADLEN(NFS4_DEVICEID4_SIZE);



		if (dev->cbd_layout_type == NOTIFY_DEVICEID4_CHANGE) {

			p = read_buf(xdr, sizeof(uint32_t));

			if (unlikely(p == NULL)) {

				status = htonl(NFS4ERR_BADXDR);

				goto err;

			}

			dev->cbd_immediate = ntohl(*p++);

		} else {

			dev->cbd_immediate = 0;

		}



		args->ndevs++;



		dprintk("%s: type %d layout 0x%x immediate %d\n",

			__func__, dev->cbd_notify_type, dev->cbd_layout_type,

			dev->cbd_immediate);

	}

out:

	dprintk("%s: status %d ndevs %d\n",

		__func__, ntohl(status), args->ndevs);

	return status;

err:

	kfree(args->devs);

	goto out;

}



static __be32 decode_sessionid(struct xdr_stream *xdr,

				 struct nfs4_sessionid *sid)

{
@@ -639,10 +727,10 @@ preprocess_nfs41_op(int nop, unsigned int op_nr, struct callback_op **op) 
	case OP_CB_RECALL_ANY:

	case OP_CB_RECALL_SLOT:

	case OP_CB_LAYOUTRECALL:

	case OP_CB_NOTIFY_DEVICEID:

		*op = &callback_ops[op_nr];

		break;



	case OP_CB_NOTIFY_DEVICEID:

	case OP_CB_NOTIFY:

	case OP_CB_PUSH_DELEG:

	case OP_CB_RECALLABLE_OBJ_AVAIL:
@@ -849,6 +937,12 @@ static struct callback_op callback_ops[] = { 
			(callback_decode_arg_t)decode_layoutrecall_args,

		.res_maxsize = CB_OP_LAYOUTRECALL_RES_MAXSZ,

	},

	[OP_CB_NOTIFY_DEVICEID] = {

		.process_op = (callback_process_op_t)nfs4_callback_devicenotify,

		.decode_args =

			(callback_decode_arg_t)decode_devicenotify_args,

		.res_maxsize = CB_OP_DEVICENOTIFY_RES_MAXSZ,

	},

	[OP_CB_SEQUENCE] = {

		.process_op = (callback_process_op_t)nfs4_callback_sequence,

		.decode_args = (callback_decode_arg_t)decode_cb_sequence_args,

CRA Git | Maintained and supported by SUSTech CRA and CCSE