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

Commit 6736c047 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: (25 commits)
  nfs: set vs_hidden on nfs4_callback_version4 (try #2)
  pnfs-obj: Support for RAID5 read-4-write interface.
  pnfs-obj: move to ore 03: Remove old raid engine
  pnfs-obj: move to ore 02: move to ORE
  pnfs-obj: move to ore 01: ore_layout & ore_components
  pnfs-obj: Rename objlayout_io_state => objlayout_io_res
  pnfs-obj: Get rid of objlayout_{alloc,free}_io_state
  pnfs-obj: Return PNFS_NOT_ATTEMPTED in case of read/write_pagelist
  pnfs-obj: Remove redundant EOF from objlayout_io_state
  nfs: Remove unused variable from write.c
  nfs: Fix unused variable warning from file.c
  NFS: Remove no-op less-than-zero checks on unsigned variables.
  NFS: Clean up nfs4_xdr_dec_secinfo()
  NFS: Fix documenting comment for nfs_create_request()
  NFS4: fix cb_recallany decode error
  nfs4: serialize layoutcommit
  SUNRPC: remove rpcbind clients destruction on module cleanup
  SUNRPC: remove rpcbind clients creation during service registering
  NFSd: call svc rpcbind cleanup explicitly
  SUNRPC: cleanup service destruction
  ...
parents 16dfd1fa 6070295e

fs/exofs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# selected by any of the users.

config ORE

	tristate

	depends on EXOFS_FS

	depends on EXOFS_FS || PNFS_OBJLAYOUT

	select ASYNC_XOR

	default SCSI_OSD_ULD

fs/nfs/callback_xdr.c

+7 −5
Original line number Diff line number Diff line
@@ -488,17 +488,18 @@ static __be32 decode_recallany_args(struct svc_rqst *rqstp, 
				      struct xdr_stream *xdr,

				      struct cb_recallanyargs *args)

{

	__be32 *p;

	uint32_t bitmap[2];

	__be32 *p, status;



	args->craa_addr = svc_addr(rqstp);

	p = read_buf(xdr, 4);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_BADXDR);

	args->craa_objs_to_keep = ntohl(*p++);

	p = read_buf(xdr, 4);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_BADXDR);

	args->craa_type_mask = ntohl(*p);

	status = decode_bitmap(xdr, bitmap);

	if (unlikely(status))

		return status;

	args->craa_type_mask = bitmap[0];



	return 0;

}
@@ -986,4 +987,5 @@ struct svc_version nfs4_callback_version4 = { 
	.vs_proc = nfs4_callback_procedures1,

	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = 1,

};

fs/nfs/file.c

+3 −6
Original line number Diff line number Diff line
@@ -137,11 +137,9 @@ nfs_file_open(struct inode *inode, struct file *filp) 
static int

nfs_file_release(struct inode *inode, struct file *filp)

{

	struct dentry *dentry = filp->f_path.dentry;



	dprintk("NFS: release(%s/%s)\n",

			dentry->d_parent->d_name.name,

			dentry->d_name.name);

			filp->f_path.dentry->d_parent->d_name.name,

			filp->f_path.dentry->d_name.name);



	nfs_inc_stats(inode, NFSIOS_VFSRELEASE);

	return nfs_release(inode, filp);
@@ -228,14 +226,13 @@ nfs_file_read(struct kiocb *iocb, const struct iovec *iov, 
	struct dentry * dentry = iocb->ki_filp->f_path.dentry;

	struct inode * inode = dentry->d_inode;

	ssize_t result;

	size_t count = iov_length(iov, nr_segs);



	if (iocb->ki_filp->f_flags & O_DIRECT)

		return nfs_file_direct_read(iocb, iov, nr_segs, pos);



	dprintk("NFS: read(%s/%s, %lu@%lu)\n",

		dentry->d_parent->d_name.name, dentry->d_name.name,

		(unsigned long) count, (unsigned long) pos);

		(unsigned long) iov_length(iov, nr_segs), (unsigned long) pos);



	result = nfs_revalidate_mapping(inode, iocb->ki_filp->f_mapping);

	if (!result) {

fs/nfs/nfs4filelayout.c

+3 −4
Original line number Diff line number Diff line
@@ -449,9 +449,8 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo, 


	fl->dsaddr = dsaddr;



	if (fl->first_stripe_index < 0 ||

	    fl->first_stripe_index >= dsaddr->stripe_count) {

		dprintk("%s Bad first_stripe_index %d\n",

	if (fl->first_stripe_index >= dsaddr->stripe_count) {

		dprintk("%s Bad first_stripe_index %u\n",

				__func__, fl->first_stripe_index);

		goto out_put;

	}
@@ -552,7 +551,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, 


	/* Note that a zero value for num_fh is legal for STRIPE_SPARSE.

	 * Futher checking is done in filelayout_check_layout */

	if (fl->num_fh < 0 || fl->num_fh >

	if (fl->num_fh >

	    max(NFS4_PNFS_MAX_STRIPE_CNT, NFS4_PNFS_MAX_MULTI_CNT))

		goto out_err;

fs/nfs/nfs4proc.c

+6 −0
Original line number Diff line number Diff line
@@ -5950,6 +5950,7 @@ static void nfs4_layoutcommit_release(void *calldata) 
{

	struct nfs4_layoutcommit_data *data = calldata;

	struct pnfs_layout_segment *lseg, *tmp;

	unsigned long *bitlock = &NFS_I(data->args.inode)->flags;



	pnfs_cleanup_layoutcommit(data);

	/* Matched by references in pnfs_set_layoutcommit */
@@ -5959,6 +5960,11 @@ static void nfs4_layoutcommit_release(void *calldata) 
				       &lseg->pls_flags))

			put_lseg(lseg);

	}



	clear_bit_unlock(NFS_INO_LAYOUTCOMMITTING, bitlock);

	smp_mb__after_clear_bit();

	wake_up_bit(bitlock, NFS_INO_LAYOUTCOMMITTING);



	put_rpccred(data->cred);

	kfree(data);

}