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

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

* 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (26 commits)
  Check validity of cl_rpcclient in nfs_server_list_show
  NFS: Get rid of the nfs_rdata_mempool
  NFS: Don't rely on PageError in nfs_readpage_release_partial
  NFS: Get rid of unnecessary calls to ClearPageError() in read code
  NFS: Get rid of nfs_restart_rpc()
  NFS: Get rid of the unused nfs_write_data->flags field
  NFS: Get rid of the unused nfs_read_data->flags field
  NFSv4: Translate NFS4ERR_BADNAME into ENOENT when applied to a lookup
  NFS: Remove the unused "lookupfh()" version of nfs4_proc_lookup()
  NFS: Use the inode->i_version to cache NFSv4 change attribute information
  SUNRPC: Remove unnecessary export of rpc_sockaddr2uaddr
  SUNRPC: Fix rpc_sockaddr2uaddr
  nfs/super.c: local functions should be static
  pnfsblock: fix writeback deadlock
  pnfsblock: fix NULL pointer dereference
  pnfs: recoalesce when ld read pagelist fails
  pnfs: recoalesce when ld write pagelist fails
  pnfs: make _set_lo_fail generic
  pnfsblock: add missing rpc_put_mount and path_put
  SUNRPC/NFS: make rpc pipe upcall generic
  ...
parents 1442d167 940aab49

fs/nfs/blocklayout/blocklayout.c

+31 −27
Original line number Diff line number Diff line
@@ -176,17 +176,6 @@ retry: 
	return bio;

}



static void bl_set_lo_fail(struct pnfs_layout_segment *lseg)

{

	if (lseg->pls_range.iomode == IOMODE_RW) {

		dprintk("%s Setting layout IOMODE_RW fail bit\n", __func__);

		set_bit(lo_fail_bit(IOMODE_RW), &lseg->pls_layout->plh_flags);

	} else {

		dprintk("%s Setting layout IOMODE_READ fail bit\n", __func__);

		set_bit(lo_fail_bit(IOMODE_READ), &lseg->pls_layout->plh_flags);

	}

}



/* This is basically copied from mpage_end_io_read */

static void bl_end_io_read(struct bio *bio, int err)

{
@@ -206,7 +195,7 @@ static void bl_end_io_read(struct bio *bio, int err) 
	if (!uptodate) {

		if (!rdata->pnfs_error)

			rdata->pnfs_error = -EIO;

		bl_set_lo_fail(rdata->lseg);

		pnfs_set_lo_fail(rdata->lseg);

	}

	bio_put(bio);

	put_parallel(par);
@@ -303,6 +292,7 @@ bl_read_pagelist(struct nfs_read_data *rdata) 
						 bl_end_io_read, par);

			if (IS_ERR(bio)) {

				rdata->pnfs_error = PTR_ERR(bio);

				bio = NULL;

				goto out;

			}

		}
@@ -370,7 +360,7 @@ static void bl_end_io_write_zero(struct bio *bio, int err) 
	if (!uptodate) {

		if (!wdata->pnfs_error)

			wdata->pnfs_error = -EIO;

		bl_set_lo_fail(wdata->lseg);

		pnfs_set_lo_fail(wdata->lseg);

	}

	bio_put(bio);

	put_parallel(par);
@@ -386,7 +376,7 @@ static void bl_end_io_write(struct bio *bio, int err) 
	if (!uptodate) {

		if (!wdata->pnfs_error)

			wdata->pnfs_error = -EIO;

		bl_set_lo_fail(wdata->lseg);

		pnfs_set_lo_fail(wdata->lseg);

	}

	bio_put(bio);

	put_parallel(par);
@@ -543,6 +533,11 @@ bl_write_pagelist(struct nfs_write_data *wdata, int sync) 
fill_invalid_ext:

		dprintk("%s need to zero %d pages\n", __func__, npg_zero);

		for (;npg_zero > 0; npg_zero--) {

			if (bl_is_sector_init(be->be_inval, isect)) {

				dprintk("isect %llu already init\n",

					(unsigned long long)isect);

				goto next_page;

			}

			/* page ref released in bl_end_io_write_zero */

			index = isect >> PAGE_CACHE_SECTOR_SHIFT;

			dprintk("%s zero %dth page: index %lu isect %llu\n",
@@ -562,8 +557,7 @@ fill_invalid_ext: 
			 * PageUptodate: It was read before

			 * sector_initialized: already written out

			 */

			if (PageDirty(page) || PageWriteback(page) ||

			    bl_is_sector_init(be->be_inval, isect)) {

			if (PageDirty(page) || PageWriteback(page)) {

				print_page(page);

				unlock_page(page);

				page_cache_release(page);
@@ -592,6 +586,7 @@ fill_invalid_ext: 
						 bl_end_io_write_zero, par);

			if (IS_ERR(bio)) {

				wdata->pnfs_error = PTR_ERR(bio);

				bio = NULL;

				goto out;

			}

			/* FIXME: This should be done in bi_end_io */
@@ -640,6 +635,7 @@ next_page: 
					 bl_end_io_write, par);

		if (IS_ERR(bio)) {

			wdata->pnfs_error = PTR_ERR(bio);

			bio = NULL;

			goto out;

		}

		isect += PAGE_CACHE_SECTORS;
@@ -805,7 +801,7 @@ nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh, 
			struct nfs4_deviceid *d_id)

{

	struct pnfs_device *dev;

	struct pnfs_block_dev *rv = NULL;

	struct pnfs_block_dev *rv;

	u32 max_resp_sz;

	int max_pages;

	struct page **pages = NULL;
@@ -823,19 +819,21 @@ nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh, 
	dev = kmalloc(sizeof(*dev), GFP_NOFS);

	if (!dev) {

		dprintk("%s kmalloc failed\n", __func__);

		return NULL;

		return ERR_PTR(-ENOMEM);

	}



	pages = kzalloc(max_pages * sizeof(struct page *), GFP_NOFS);

	if (pages == NULL) {

		kfree(dev);

		return NULL;

		return ERR_PTR(-ENOMEM);

	}

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

		pages[i] = alloc_page(GFP_NOFS);

		if (!pages[i])

		if (!pages[i]) {

			rv = ERR_PTR(-ENOMEM);

			goto out_free;

		}

	}



	memcpy(&dev->dev_id, d_id, sizeof(*d_id));

	dev->layout_type = LAYOUT_BLOCK_VOLUME;
@@ -847,8 +845,10 @@ nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh, 
	dprintk("%s: dev_id: %s\n", __func__, dev->dev_id.data);

	rc = nfs4_proc_getdeviceinfo(server, dev);

	dprintk("%s getdevice info returns %d\n", __func__, rc);

	if (rc)

	if (rc) {

		rv = ERR_PTR(rc);

		goto out_free;

	}



	rv = nfs4_blk_decode_device(server, dev);

 out_free:
@@ -866,7 +866,7 @@ bl_set_layoutdriver(struct nfs_server *server, const struct nfs_fh *fh) 
	struct pnfs_devicelist *dlist = NULL;

	struct pnfs_block_dev *bdev;

	LIST_HEAD(block_disklist);

	int status = 0, i;

	int status, i;



	dprintk("%s enter\n", __func__);
@@ -898,8 +898,8 @@ bl_set_layoutdriver(struct nfs_server *server, const struct nfs_fh *fh) 
		for (i = 0; i < dlist->num_devs; i++) {

			bdev = nfs4_blk_get_deviceinfo(server, fh,

						       &dlist->dev_id[i]);

			if (!bdev) {

				status = -ENODEV;

			if (IS_ERR(bdev)) {

				status = PTR_ERR(bdev);

				goto out_error;

			}

			spin_lock(&b_mt_id->bm_lock);
@@ -960,7 +960,7 @@ static struct pnfs_layoutdriver_type blocklayout_type = { 
};



static const struct rpc_pipe_ops bl_upcall_ops = {

	.upcall		= bl_pipe_upcall,

	.upcall		= rpc_pipe_generic_upcall,

	.downcall	= bl_pipe_downcall,

	.destroy_msg	= bl_pipe_destroy_msg,

};
@@ -989,17 +989,20 @@ static int __init nfs4blocklayout_init(void) 
			      mnt,

			      NFS_PIPE_DIRNAME, 0, &path);

	if (ret)

		goto out_remove;

		goto out_putrpc;



	bl_device_pipe = rpc_mkpipe(path.dentry, "blocklayout", NULL,

				    &bl_upcall_ops, 0);

	path_put(&path);

	if (IS_ERR(bl_device_pipe)) {

		ret = PTR_ERR(bl_device_pipe);

		goto out_remove;

		goto out_putrpc;

	}

out:

	return ret;



out_putrpc:

	rpc_put_mount();

out_remove:

	pnfs_unregister_layoutdriver(&blocklayout_type);

	return ret;
@@ -1012,6 +1015,7 @@ static void __exit nfs4blocklayout_exit(void) 


	pnfs_unregister_layoutdriver(&blocklayout_type);

	rpc_unlink(bl_device_pipe);

	rpc_put_mount();

}



MODULE_ALIAS("nfs-layouttype4-3");

fs/nfs/blocklayout/blocklayout.h

+1 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ BLK_LSEG2EXT(struct pnfs_layout_segment *lseg) 
}



struct bl_dev_msg {

	int status;

	int32_t status;

	uint32_t major, minor;

};
@@ -169,8 +169,6 @@ extern wait_queue_head_t bl_wq; 
#define BL_DEVICE_REQUEST_ERR          0x2 /* User level process fails */



/* blocklayoutdev.c */

ssize_t bl_pipe_upcall(struct file *, struct rpc_pipe_msg *,

		       char __user *, size_t);

ssize_t bl_pipe_downcall(struct file *, const char __user *, size_t);

void bl_pipe_destroy_msg(struct rpc_pipe_msg *);

struct block_device *nfs4_blkdev_get(dev_t dev);

fs/nfs/blocklayout/blocklayoutdev.c

+8 −27
Original line number Diff line number Diff line
@@ -79,28 +79,6 @@ int nfs4_blkdev_put(struct block_device *bdev) 
	return blkdev_put(bdev, FMODE_READ);

}



/*

 * Shouldn't there be a rpc_generic_upcall() to do this for us?

 */

ssize_t bl_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg,

		       char __user *dst, size_t buflen)

{

	char *data = (char *)msg->data + msg->copied;

	size_t mlen = min(msg->len - msg->copied, buflen);

	unsigned long left;



	left = copy_to_user(dst, data, mlen);

	if (left == mlen) {

		msg->errno = -EFAULT;

		return -EFAULT;

	}



	mlen -= left;

	msg->copied += mlen;

	msg->errno = 0;

	return mlen;

}



static struct bl_dev_msg bl_mount_reply;



ssize_t bl_pipe_downcall(struct file *filp, const char __user *src,
@@ -131,7 +109,7 @@ struct pnfs_block_dev * 
nfs4_blk_decode_device(struct nfs_server *server,

		       struct pnfs_device *dev)

{

	struct pnfs_block_dev *rv = NULL;

	struct pnfs_block_dev *rv;

	struct block_device *bd = NULL;

	struct rpc_pipe_msg msg;

	struct bl_msg_hdr bl_msg = {
@@ -141,7 +119,7 @@ nfs4_blk_decode_device(struct nfs_server *server, 
	uint8_t *dataptr;

	DECLARE_WAITQUEUE(wq, current);

	struct bl_dev_msg *reply = &bl_mount_reply;

	int offset, len, i;

	int offset, len, i, rc;



	dprintk("%s CREATING PIPEFS MESSAGE\n", __func__);

	dprintk("%s: deviceid: %s, mincount: %d\n", __func__, dev->dev_id.data,
@@ -168,8 +146,10 @@ nfs4_blk_decode_device(struct nfs_server *server, 


	dprintk("%s CALLING USERSPACE DAEMON\n", __func__);

	add_wait_queue(&bl_wq, &wq);

	if (rpc_queue_upcall(bl_device_pipe->d_inode, &msg) < 0) {

	rc = rpc_queue_upcall(bl_device_pipe->d_inode, &msg);

	if (rc < 0) {

		remove_wait_queue(&bl_wq, &wq);

		rv = ERR_PTR(rc);

		goto out;

	}
@@ -187,8 +167,9 @@ nfs4_blk_decode_device(struct nfs_server *server, 


	bd = nfs4_blkdev_get(MKDEV(reply->major, reply->minor));

	if (IS_ERR(bd)) {

		dprintk("%s failed to open device : %ld\n",

			__func__, PTR_ERR(bd));

		rc = PTR_ERR(bd);

		dprintk("%s failed to open device : %d\n", __func__, rc);

		rv = ERR_PTR(rc);

		goto out;

	}

fs/nfs/client.c

+4 −0
Original line number Diff line number Diff line
@@ -1868,6 +1868,10 @@ static int nfs_server_list_show(struct seq_file *m, void *v) 
	/* display one transport per line on subsequent lines */

	clp = list_entry(v, struct nfs_client, cl_share_link);



	/* Check if the client is initialized */

	if (clp->cl_cons_state != NFS_CS_READY)

		return 0;



	seq_printf(m, "v%u %s %s %3d %s\n",

		   clp->rpc_ops->version,

		   rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_ADDR),

fs/nfs/delegation.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct 
			sizeof(delegation->stateid.data));

	delegation->type = res->delegation_type;

	delegation->maxsize = res->maxsize;

	delegation->change_attr = nfsi->change_attr;

	delegation->change_attr = inode->i_version;

	delegation->cred = get_rpccred(cred);

	delegation->inode = inode;

	delegation->flags = 1<<NFS_DELEGATION_REFERENCED;

CRA Git | Maintained and supported by SUSTech CRA and CCSE