Commit 0122c6d5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'rxrpc-rewrite-20160904-1' of... 

Merge tag 'rxrpc-rewrite-20160904-1' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs



David Howells says:

====================
rxrpc: Small fixes

Here's a set of small fix patches:

 (1) Fix some uninitialised variables.

 (2) Set the client call state before making it live by attaching it to the
     conn struct.

 (3) Randomise the epoch and starting client conn ID values, and don't
     change the epoch when the client conn ID rolls round.

 (4) Replace deprecated create_singlethread_workqueue() calls.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5e1e61a3 434e6120

fs/afs/callback.c

+2 −2
Original line number Diff line number Diff line
@@ -461,8 +461,8 @@ static void afs_callback_updater(struct work_struct *work) 
 */

int __init afs_callback_update_init(void)

{

	afs_callback_update_worker =

		create_singlethread_workqueue("kafs_callbackd");

	afs_callback_update_worker = alloc_ordered_workqueue("kafs_callbackd",

							     WQ_MEM_RECLAIM);

	return afs_callback_update_worker ? 0 : -ENOMEM;

}

fs/afs/flock.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ static int afs_init_lock_manager(void) 
	if (!afs_lock_manager) {

		mutex_lock(&afs_lock_manager_mutex);

		if (!afs_lock_manager) {

			afs_lock_manager =

				create_singlethread_workqueue("kafs_lockd");

			afs_lock_manager = alloc_workqueue("kafs_lockd",

							   WQ_MEM_RECLAIM, 0);

			if (!afs_lock_manager)

				ret = -ENOMEM;

		}

fs/afs/rxrpc.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int afs_open_socket(void) 
	_enter("");



	ret = -ENOMEM;

	afs_async_calls = create_singlethread_workqueue("kafsd");

	afs_async_calls = alloc_workqueue("kafsd", WQ_MEM_RECLAIM, 0);

	if (!afs_async_calls)

		goto error_0;

fs/afs/vlocation.c

+2 −2
Original line number Diff line number Diff line
@@ -594,8 +594,8 @@ static void afs_vlocation_reaper(struct work_struct *work) 
 */

int __init afs_vlocation_update_init(void)

{

	afs_vlocation_update_worker =

		create_singlethread_workqueue("kafs_vlupdated");

	afs_vlocation_update_worker = alloc_workqueue("kafs_vlupdated",

						      WQ_MEM_RECLAIM, 0);

	return afs_vlocation_update_worker ? 0 : -ENOMEM;

}

include/rxrpc/packet.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ typedef __be32 rxrpc_serial_net_t; /* on-the-wire Rx message serial number */ 
 */

struct rxrpc_wire_header {

	__be32		epoch;		/* client boot timestamp */

#define RXRPC_RANDOM_EPOCH	0x80000000	/* Random if set, date-based if not */



	__be32		cid;		/* connection and channel ID */

#define RXRPC_MAXCALLS		4			/* max active calls per conn */

CRA Git | Maintained and supported by SUSTech CRA and CCSE