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

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

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

* 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  SUNRPC: Support for RPC over AF_LOCAL transports
  SUNRPC: Remove obsolete comment
  SUNRPC: Use AF_LOCAL for rpcbind upcalls
  SUNRPC: Clean up use of curly braces in switch cases
  NFS: Revert NFSROOT default mount options
  SUNRPC: Rename xs_encode_tcp_fragment_header()
  nfs,rcu: convert call_rcu(nfs_free_delegation_callback) to kfree_rcu()
  nfs41: Correct offset for LAYOUTCOMMIT
  NFS: nfs_update_inode: print current and new inode size in debug output
  NFSv4.1: Fix the handling of NFS4ERR_SEQ_MISORDERED errors
  NFSv4: Handle expired stateids when the lease is still valid
  SUNRPC: Deal with the lack of a SYN_SENT sk->sk_state_change callback...
parents 2ff55e98 176e21ee

fs/nfs/delegation.c

+1 −13
Original line number Diff line number Diff line
@@ -21,25 +21,13 @@ 
#include "delegation.h"

#include "internal.h"



static void nfs_do_free_delegation(struct nfs_delegation *delegation)

{

	kfree(delegation);

}



static void nfs_free_delegation_callback(struct rcu_head *head)

{

	struct nfs_delegation *delegation = container_of(head, struct nfs_delegation, rcu);



	nfs_do_free_delegation(delegation);

}



static void nfs_free_delegation(struct nfs_delegation *delegation)

{

	if (delegation->cred) {

		put_rpccred(delegation->cred);

		delegation->cred = NULL;

	}

	call_rcu(&delegation->rcu, nfs_free_delegation_callback);

	kfree_rcu(delegation, rcu);

}



/**

fs/nfs/inode.c

+6 −2
Original line number Diff line number Diff line
@@ -1298,8 +1298,12 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
				i_size_write(inode, new_isize);

				invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;

			}

			dprintk("NFS: isize change on server for file %s/%ld\n",

					inode->i_sb->s_id, inode->i_ino);

			dprintk("NFS: isize change on server for file %s/%ld "

					"(%Ld to %Ld)\n",

					inode->i_sb->s_id,

					inode->i_ino,

					(long long)cur_isize,

					(long long)new_isize);

		}

	} else

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

fs/nfs/nfs4proc.c

+7 −2
Original line number Diff line number Diff line
@@ -267,9 +267,11 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc 
				break;

			nfs4_schedule_stateid_recovery(server, state);

			goto wait_on_recovery;

		case -NFS4ERR_EXPIRED:

			if (state != NULL)

				nfs4_schedule_stateid_recovery(server, state);

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_EXPIRED:

			nfs4_schedule_lease_recovery(clp);

			goto wait_on_recovery;

#if defined(CONFIG_NFS_V4_1)
@@ -3670,9 +3672,11 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, 
				break;

			nfs4_schedule_stateid_recovery(server, state);

			goto wait_on_recovery;

		case -NFS4ERR_EXPIRED:

			if (state != NULL)

				nfs4_schedule_stateid_recovery(server, state);

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_EXPIRED:

			nfs4_schedule_lease_recovery(clp);

			goto wait_on_recovery;

#if defined(CONFIG_NFS_V4_1)
@@ -4543,6 +4547,7 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) 
			case -ESTALE:

				goto out;

			case -NFS4ERR_EXPIRED:

				nfs4_schedule_stateid_recovery(server, state);

			case -NFS4ERR_STALE_CLIENTID:

			case -NFS4ERR_STALE_STATEID:

				nfs4_schedule_lease_recovery(server->nfs_client);

fs/nfs/nfs4state.c

+5 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,10 @@ static int nfs4_reclaim_lease(struct nfs_client *clp) 
#ifdef CONFIG_NFS_V4_1

void nfs4_schedule_session_recovery(struct nfs4_session *session)

{

	nfs4_schedule_lease_recovery(session->clp);

	struct nfs_client *clp = session->clp;



	set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);

	nfs4_schedule_lease_recovery(clp);

}

EXPORT_SYMBOL_GPL(nfs4_schedule_session_recovery);
@@ -1549,6 +1552,7 @@ static int nfs4_reset_session(struct nfs_client *clp) 
		status = nfs4_recovery_handle_error(clp, status);

		goto out;

	}

	clear_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);

	/* create_session negotiated new slot table */

	clear_bit(NFS4CLNT_RECALL_SLOT, &clp->cl_state);

fs/nfs/nfsroot.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
#define NFS_ROOT		"/tftpboot/%s"



/* Default NFSROOT mount options. */

#define NFS_DEF_OPTIONS		"udp"

#define NFS_DEF_OPTIONS		"vers=2,udp,rsize=4096,wsize=4096"



/* Parameters passed from the kernel command line */

static char nfs_root_parms[256] __initdata = "";