Merge branch 'devel-for-2.6.31' into for-2.6.31 (1f84603c) · Commits · 戴 / test

fs/lockd/clntproc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,6 @@ static void nlmclnt_setlockargs(struct nlm_rqst req, struct file_lock fl)
		struct nlm_lock *lock = &argp->lock;

		nlmclnt_next_cookie(&argp->cookie);
		argp->state = nsm_local_state;
		memcpy(&lock->fh, NFS_FH(fl->fl_file->f_path.dentry->d_inode), sizeof(struct nfs_fh));
		lock->caller = utsname()->nodename;
		lock->oh.data = req->a_owner;
		@@ -165,6 +164,7 @@ int nlmclnt_proc(struct nlm_host host, int cmd, struct file_lock fl)
		/* Set up the argument struct */
		nlmclnt_setlockargs(call, fl);

		lock_kernel();
		if (IS_SETLK(cmd) \|\| IS_SETLKW(cmd)) {
		if (fl->fl_type != F_UNLCK) {
		call->a_args.block = IS_SETLKW(cmd) ? 1 : 0;
		@@ -178,6 +178,7 @@ int nlmclnt_proc(struct nlm_host host, int cmd, struct file_lock fl)

		fl->fl_ops->fl_release_private(fl);
		fl->fl_ops = NULL;
		unlock_kernel();

		dprintk("lockd: clnt proc returns %d\n", status);
		return status;
		@@ -519,6 +520,7 @@ nlmclnt_lock(struct nlm_rqst req, struct file_lock fl)

		if (nsm_monitor(host) < 0)
		goto out;
		req->a_args.state = nsm_local_state;

		fl->fl_flags \|= FL_ACCESS;
		status = do_vfs_lock(fl);

+13 −6

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ static DEFINE_SPINLOCK(nsm_lock);
		/*
		* Local NSM state
		*/
		int __read_mostly nsm_local_state;
		u32 __read_mostly nsm_local_state;
		int __read_mostly nsm_use_hostnames;

		static inline struct sockaddr nsm_addr(const struct nsm_handle nsm)
		@@ -112,6 +112,7 @@ static struct rpc_clnt *nsm_create(void)
		.program = &nsm_program,
		.version = NSM_VERSION,
		.authflavor = RPC_AUTH_NULL,
		.flags = RPC_CLNT_CREATE_NOPING,
		};

		return rpc_create(&args);
		@@ -184,15 +185,21 @@ int nsm_monitor(const struct nlm_host *host)
		nsm->sm_mon_name = nsm_use_hostnames ? nsm->sm_name : nsm->sm_addrbuf;

		status = nsm_mon_unmon(nsm, NSMPROC_MON, &res);
		if (res.status != 0)
		if (unlikely(res.status != 0))
		status = -EIO;
		if (status < 0)
		if (unlikely(status < 0)) {
		printk(KERN_NOTICE "lockd: cannot monitor %s\n", nsm->sm_name);
		else
		nsm->sm_monitored = 1;
		return status;
		}

		nsm->sm_monitored = 1;
		if (unlikely(nsm_local_state != res.state)) {
		nsm_local_state = res.state;
		dprintk("lockd: NSM state changed to %d\n", nsm_local_state);
		}
		return 0;
		}

		/**
		* nsm_unmonitor - Unregister peer notification
		* @host: pointer to nlm_host of peer to stop monitoring

+3 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,9 @@ nfs4_callback_up(struct svc_serv *serv)
		nfs_callback_tcpport6 = ret;
		dprintk("NFS: Callback listener port = %u (af %u)\n",
		nfs_callback_tcpport6, PF_INET6);
		} else if (ret != -EAFNOSUPPORT)
		} else if (ret == -EAFNOSUPPORT)
		ret = 0;
		else
		goto out_err;
		#endif /* defined(CONFIG_IPV6) \|\| defined(CONFIG_IPV6_MODULE) */

+6 −3

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ static struct nfs_client nfs_alloc_client(const struct nfs_client_initdata cl_
		{
		struct nfs_client *clp;
		struct rpc_cred *cred;
		int err = -ENOMEM;

		if ((clp = kzalloc(sizeof(*clp), GFP_KERNEL)) == NULL)
		goto error_0;
		@@ -129,6 +130,7 @@ static struct nfs_client nfs_alloc_client(const struct nfs_client_initdata cl_
		clp->cl_addrlen = cl_init->addrlen;

		if (cl_init->hostname) {
		err = -ENOMEM;
		clp->cl_hostname = kstrdup(cl_init->hostname, GFP_KERNEL);
		if (!clp->cl_hostname)
		goto error_cleanup;
		@@ -159,7 +161,7 @@ static struct nfs_client nfs_alloc_client(const struct nfs_client_initdata cl_
		error_cleanup:
		kfree(clp);
		error_0:
		return NULL;
		return ERR_PTR(err);
		}

		static void nfs4_shutdown_client(struct nfs_client *clp)
		@@ -480,9 +482,10 @@ static struct nfs_client nfs_get_client(const struct nfs_client_initdata cl_in
		spin_unlock(&nfs_client_lock);

		new = nfs_alloc_client(cl_init);
		} while (new);
		} while (!IS_ERR(new));

		return ERR_PTR(-ENOMEM);
		dprintk("--> nfs_get_client() = %ld [failed]\n", PTR_ERR(new));
		return new;

		/* install a new client and return with it unready */
		install_client:

+16 −16

Original line number	Diff line number	Diff line
		@@ -68,29 +68,26 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
		{
		struct inode *inode = state->inode;
		struct file_lock *fl;
		int status;
		int status = 0;

		if (inode->i_flock == NULL)
		goto out;

		/* Protect inode->i_flock using the BKL */
		lock_kernel();
		for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
		if (!(fl->fl_flags & (FL_POSIX\|FL_FLOCK)))
		continue;
		if (nfs_file_open_context(fl->fl_file) != ctx)
		continue;
		unlock_kernel();
		status = nfs4_lock_delegation_recall(state, fl);
		if (status >= 0)
		continue;
		switch (status) {
		default:
		printk(KERN_ERR "%s: unhandled error %d.\n",
		__func__, status);
		case -NFS4ERR_EXPIRED:
		/* kill_proc(fl->fl_pid, SIGLOST, 1); */
		case -NFS4ERR_STALE_CLIENTID:
		nfs4_schedule_state_recovery(NFS_SERVER(inode)->nfs_client);
		goto out_err;
		}
		if (status < 0)
		goto out;
		lock_kernel();
		}
		return 0;
		out_err:
		unlock_kernel();
		out:
		return status;
		}

		@@ -268,7 +265,10 @@ static int __nfs_inode_return_delegation(struct inode *inode, struct nfs_delegat
		struct nfs_inode *nfsi = NFS_I(inode);

		nfs_msync_inode(inode);
		/* Guard against new delegated open calls */
		/*
		* Guard against new delegated open/lock/unlock calls and against
		* state recovery
		*/
		down_write(&nfsi->rwsem);
		nfs_delegation_claim_opens(inode, &delegation->stateid);
		up_write(&nfsi->rwsem);