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

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  SUNRPC: Fix sparse warnings
  NLM: Fix sparse warnings
  NFS: Fix more sparse warnings
  NFS: Fix some 'sparse' warnings...
  SUNRPC: remove dead variable 'rpciod_running'
  NFS4: Fix incorrect use of sizeof() in fs/nfs/nfs4xdr.c
  NFS: use zero_user_page
  NLM: don't use CLONE_SIGHAND in nlmclnt_recovery
  NLM: Fix locking client timeouts...
parents d3a36fb8 dd504ea1

fs/lockd/clntlock.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ nlmclnt_recovery(struct nlm_host *host) 
	if (!host->h_reclaiming++) {

		nlm_get_host(host);

		__module_get(THIS_MODULE);

		if (kernel_thread(reclaimer, host, CLONE_KERNEL) < 0)

		if (kernel_thread(reclaimer, host, CLONE_FS | CLONE_FILES) < 0)

			module_put(THIS_MODULE);

	}

}

fs/lockd/host.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ nlm_bind_host(struct nlm_host *host) 
					host->h_nextrebind - jiffies);

		}

	} else {

		unsigned long increment = nlmsvc_timeout * HZ;

		unsigned long increment = nlmsvc_timeout;

		struct rpc_timeout timeparms = {

			.to_initval	= increment,

			.to_increment	= increment,

fs/lockd/xdr.c

+0 −4
Original line number Diff line number Diff line
@@ -586,10 +586,6 @@ static struct rpc_version nlm_version3 = { 
		.procs		= nlm_procedures,

};



#ifdef 	CONFIG_LOCKD_V4

extern struct rpc_version nlm_version4;

#endif



static struct rpc_version *	nlm_versions[] = {

	[1] = &nlm_version1,

	[3] = &nlm_version3,

fs/lockd/xdr4.c

+4 −2
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ static __be32 * 
nlm4_decode_lock(__be32 *p, struct nlm_lock *lock)

{

	struct file_lock	*fl = &lock->fl;

	__s64			len, start, end;

	__u64			len, start;

	__s64			end;



	if (!(p = xdr_decode_string_inplace(p, &lock->caller,

					    &lock->len, NLM_MAXSTRLEN))
@@ -417,7 +418,8 @@ nlm4clt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) 
	if (resp->status == nlm_lck_denied) {

		struct file_lock	*fl = &resp->lock.fl;

		u32			excl;

		s64			start, end, len;

		__u64			start, len;

		__s64			end;



		memset(&resp->lock, 0, sizeof(resp->lock));

		locks_init_lock(fl);

fs/nfs/callback.h

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ enum nfs4_callback_opnum { 
};



struct cb_compound_hdr_arg {

	int taglen;

	unsigned int taglen;

	const char *tag;

	unsigned int callback_ident;

	unsigned nops;
@@ -32,7 +32,7 @@ struct cb_compound_hdr_arg { 


struct cb_compound_hdr_res {

	__be32 *status;

	int taglen;

	unsigned int taglen;

	const char *tag;

	__be32 *nops;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE