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

Commit 56ff9c83 authored by David Howells's avatar David Howells
Browse files

afs: Kill afs_wait_mode 



The afs_wait_mode struct isn't really necessary.  Client calls only use one
of a choice of two (synchronous or the asynchronous) and incoming calls
don't use the wait at all.  Replace with a boolean parameter.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 8e8d7f13

fs/afs/callback.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void afs_dispatch_give_up_callbacks(struct work_struct *work) 
	 *   had callbacks entirely, and the server will call us later to break

	 *   them

	 */

	afs_fs_give_up_callbacks(server, &afs_async_call);

	afs_fs_give_up_callbacks(server, true);

}



/*

fs/afs/fsclient.c

+40 −40
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ int afs_fs_fetch_file_status(struct afs_server *server, 
			     struct key *key,

			     struct afs_vnode *vnode,

			     struct afs_volsync *volsync,

			     const struct afs_wait_mode *wait_mode)

			     bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -300,7 +300,7 @@ int afs_fs_fetch_file_status(struct afs_server *server, 
	bp[2] = htonl(vnode->fid.vnode);

	bp[3] = htonl(vnode->fid.unique);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -464,7 +464,7 @@ static int afs_fs_fetch_data64(struct afs_server *server, 
			       struct key *key,

			       struct afs_vnode *vnode,

			       struct afs_read *req,

			       const struct afs_wait_mode *wait_mode)

			       bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -495,7 +495,7 @@ static int afs_fs_fetch_data64(struct afs_server *server, 
	bp[7] = htonl(lower_32_bits(req->len));



	atomic_inc(&req->usage);

	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -505,7 +505,7 @@ int afs_fs_fetch_data(struct afs_server *server, 
		      struct key *key,

		      struct afs_vnode *vnode,

		      struct afs_read *req,

		      const struct afs_wait_mode *wait_mode)

		      bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -513,7 +513,7 @@ int afs_fs_fetch_data(struct afs_server *server, 
	if (upper_32_bits(req->pos) ||

	    upper_32_bits(req->len) ||

	    upper_32_bits(req->pos + req->len))

		return afs_fs_fetch_data64(server, key, vnode, req, wait_mode);

		return afs_fs_fetch_data64(server, key, vnode, req, async);



	_enter("");
@@ -539,7 +539,7 @@ int afs_fs_fetch_data(struct afs_server *server, 
	bp[5] = htonl(lower_32_bits(req->len));



	atomic_inc(&req->usage);

	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -568,7 +568,7 @@ static const struct afs_call_type afs_RXFSGiveUpCallBacks = { 
 * - the callbacks are held in the server->cb_break ring

 */

int afs_fs_give_up_callbacks(struct afs_server *server,

			     const struct afs_wait_mode *wait_mode)

			     bool async)

{

	struct afs_call *call;

	size_t ncallbacks;
@@ -622,7 +622,7 @@ int afs_fs_give_up_callbacks(struct afs_server *server, 
	ASSERT(ncallbacks > 0);

	wake_up_nr(&server->cb_break_waitq, ncallbacks);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -673,7 +673,7 @@ int afs_fs_create(struct afs_server *server, 
		  struct afs_fid *newfid,

		  struct afs_file_status *newstatus,

		  struct afs_callback *newcb,

		  const struct afs_wait_mode *wait_mode)

		  bool async)

{

	struct afs_call *call;

	size_t namesz, reqsz, padsz;
@@ -718,7 +718,7 @@ int afs_fs_create(struct afs_server *server, 
	*bp++ = htonl(mode & S_IALLUGO); /* unix mode */

	*bp++ = 0; /* segment size */



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -763,7 +763,7 @@ int afs_fs_remove(struct afs_server *server, 
		  struct afs_vnode *vnode,

		  const char *name,

		  bool isdir,

		  const struct afs_wait_mode *wait_mode)

		  bool async)

{

	struct afs_call *call;

	size_t namesz, reqsz, padsz;
@@ -798,7 +798,7 @@ int afs_fs_remove(struct afs_server *server, 
		bp = (void *) bp + padsz;

	}



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -844,7 +844,7 @@ int afs_fs_link(struct afs_server *server, 
		struct afs_vnode *dvnode,

		struct afs_vnode *vnode,

		const char *name,

		const struct afs_wait_mode *wait_mode)

		bool async)

{

	struct afs_call *call;

	size_t namesz, reqsz, padsz;
@@ -883,7 +883,7 @@ int afs_fs_link(struct afs_server *server, 
	*bp++ = htonl(vnode->fid.vnode);

	*bp++ = htonl(vnode->fid.unique);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -932,7 +932,7 @@ int afs_fs_symlink(struct afs_server *server, 
		   const char *contents,

		   struct afs_fid *newfid,

		   struct afs_file_status *newstatus,

		   const struct afs_wait_mode *wait_mode)

		   bool async)

{

	struct afs_call *call;

	size_t namesz, reqsz, padsz, c_namesz, c_padsz;
@@ -987,7 +987,7 @@ int afs_fs_symlink(struct afs_server *server, 
	*bp++ = htonl(S_IRWXUGO); /* unix mode */

	*bp++ = 0; /* segment size */



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1036,7 +1036,7 @@ int afs_fs_rename(struct afs_server *server, 
		  const char *orig_name,

		  struct afs_vnode *new_dvnode,

		  const char *new_name,

		  const struct afs_wait_mode *wait_mode)

		  bool async)

{

	struct afs_call *call;

	size_t reqsz, o_namesz, o_padsz, n_namesz, n_padsz;
@@ -1090,7 +1090,7 @@ int afs_fs_rename(struct afs_server *server, 
		bp = (void *) bp + n_padsz;

	}



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1145,7 +1145,7 @@ static int afs_fs_store_data64(struct afs_server *server, 
			       pgoff_t first, pgoff_t last,

			       unsigned offset, unsigned to,

			       loff_t size, loff_t pos, loff_t i_size,

			       const struct afs_wait_mode *wait_mode)

			       bool async)

{

	struct afs_vnode *vnode = wb->vnode;

	struct afs_call *call;
@@ -1194,7 +1194,7 @@ static int afs_fs_store_data64(struct afs_server *server, 
	*bp++ = htonl(i_size >> 32);

	*bp++ = htonl((u32) i_size);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1203,7 +1203,7 @@ static int afs_fs_store_data64(struct afs_server *server, 
int afs_fs_store_data(struct afs_server *server, struct afs_writeback *wb,

		      pgoff_t first, pgoff_t last,

		      unsigned offset, unsigned to,

		      const struct afs_wait_mode *wait_mode)

		      bool async)

{

	struct afs_vnode *vnode = wb->vnode;

	struct afs_call *call;
@@ -1229,7 +1229,7 @@ int afs_fs_store_data(struct afs_server *server, struct afs_writeback *wb, 


	if (pos >> 32 || i_size >> 32 || size >> 32 || (pos + size) >> 32)

		return afs_fs_store_data64(server, wb, first, last, offset, to,

					   size, pos, i_size, wait_mode);

					   size, pos, i_size, async);



	call = afs_alloc_flat_call(&afs_RXFSStoreData,

				   (4 + 6 + 3) * 4,
@@ -1268,7 +1268,7 @@ int afs_fs_store_data(struct afs_server *server, struct afs_writeback *wb, 
	*bp++ = htonl(size);

	*bp++ = htonl(i_size);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1330,7 +1330,7 @@ static const struct afs_call_type afs_RXFSStoreData64_as_Status = { 
 */

static int afs_fs_setattr_size64(struct afs_server *server, struct key *key,

				 struct afs_vnode *vnode, struct iattr *attr,

				 const struct afs_wait_mode *wait_mode)

				 bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -1369,7 +1369,7 @@ static int afs_fs_setattr_size64(struct afs_server *server, struct key *key, 
	*bp++ = htonl(attr->ia_size >> 32);	/* new file length */

	*bp++ = htonl((u32) attr->ia_size);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1378,7 +1378,7 @@ static int afs_fs_setattr_size64(struct afs_server *server, struct key *key, 
 */

static int afs_fs_setattr_size(struct afs_server *server, struct key *key,

			       struct afs_vnode *vnode, struct iattr *attr,

			       const struct afs_wait_mode *wait_mode)

			       bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -1389,7 +1389,7 @@ static int afs_fs_setattr_size(struct afs_server *server, struct key *key, 
	ASSERT(attr->ia_valid & ATTR_SIZE);

	if (attr->ia_size >> 32)

		return afs_fs_setattr_size64(server, key, vnode, attr,

					     wait_mode);

					     async);



	call = afs_alloc_flat_call(&afs_RXFSStoreData_as_Status,

				   (4 + 6 + 3) * 4,
@@ -1417,7 +1417,7 @@ static int afs_fs_setattr_size(struct afs_server *server, struct key *key, 
	*bp++ = 0;				/* size of write */

	*bp++ = htonl(attr->ia_size);		/* new file length */



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1426,14 +1426,14 @@ static int afs_fs_setattr_size(struct afs_server *server, struct key *key, 
 */

int afs_fs_setattr(struct afs_server *server, struct key *key,

		   struct afs_vnode *vnode, struct iattr *attr,

		   const struct afs_wait_mode *wait_mode)

		   bool async)

{

	struct afs_call *call;

	__be32 *bp;



	if (attr->ia_valid & ATTR_SIZE)

		return afs_fs_setattr_size(server, key, vnode, attr,

					   wait_mode);

					   async);



	_enter(",%x,{%x:%u},,",

	       key_serial(key), vnode->fid.vid, vnode->fid.vnode);
@@ -1459,7 +1459,7 @@ int afs_fs_setattr(struct afs_server *server, struct key *key, 


	xdr_encode_AFS_StoreStatus(&bp, attr);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1661,7 +1661,7 @@ int afs_fs_get_volume_status(struct afs_server *server, 
			     struct key *key,

			     struct afs_vnode *vnode,

			     struct afs_volume_status *vs,

			     const struct afs_wait_mode *wait_mode)

			     bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -1691,7 +1691,7 @@ int afs_fs_get_volume_status(struct afs_server *server, 
	bp[0] = htonl(FSGETVOLUMESTATUS);

	bp[1] = htonl(vnode->fid.vid);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1753,7 +1753,7 @@ int afs_fs_set_lock(struct afs_server *server, 
		    struct key *key,

		    struct afs_vnode *vnode,

		    afs_lock_type_t type,

		    const struct afs_wait_mode *wait_mode)

		    bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -1777,7 +1777,7 @@ int afs_fs_set_lock(struct afs_server *server, 
	*bp++ = htonl(vnode->fid.unique);

	*bp++ = htonl(type);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1786,7 +1786,7 @@ int afs_fs_set_lock(struct afs_server *server, 
int afs_fs_extend_lock(struct afs_server *server,

		       struct key *key,

		       struct afs_vnode *vnode,

		       const struct afs_wait_mode *wait_mode)

		       bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -1809,7 +1809,7 @@ int afs_fs_extend_lock(struct afs_server *server, 
	*bp++ = htonl(vnode->fid.vnode);

	*bp++ = htonl(vnode->fid.unique);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}



/*
@@ -1818,7 +1818,7 @@ int afs_fs_extend_lock(struct afs_server *server, 
int afs_fs_release_lock(struct afs_server *server,

			struct key *key,

			struct afs_vnode *vnode,

			const struct afs_wait_mode *wait_mode)

			bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -1841,5 +1841,5 @@ int afs_fs_release_lock(struct afs_server *server, 
	*bp++ = htonl(vnode->fid.vnode);

	*bp++ = htonl(vnode->fid.unique);



	return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);

	return afs_make_call(&server->addr, call, GFP_NOFS, async);

}

fs/afs/internal.h

+18 −50
Original line number Diff line number Diff line
@@ -51,23 +51,6 @@ struct afs_mount_params { 
	struct key		*key;		/* key to use for secure mounting */

};



/*

 * definition of how to wait for the completion of an operation

 */

struct afs_wait_mode {

	/* RxRPC received message notification */

	rxrpc_notify_rx_t notify_rx;



	/* synchronous call waiter and call dispatched notification */

	int (*wait)(struct afs_call *call);



	/* asynchronous call completion */

	void (*async_complete)(void *reply, int error);

};



extern const struct afs_wait_mode afs_sync_call;

extern const struct afs_wait_mode afs_async_call;



enum afs_call_state {

	AFS_CALL_REQUESTING,	/* request is being sent for outgoing call */

	AFS_CALL_AWAIT_REPLY,	/* awaiting reply to outgoing call */
@@ -82,7 +65,6 @@ enum afs_call_state { 
 */

struct afs_call {

	const struct afs_call_type *type;	/* type of call */

	const struct afs_wait_mode *wait_mode;	/* completion wait mode */

	wait_queue_head_t	waitq;		/* processes awaiting completion */

	struct work_struct	async_work;	/* asynchronous work processor */

	struct work_struct	work;		/* actual work processor */
@@ -111,6 +93,7 @@ struct afs_call { 
	bool			incoming;	/* T if incoming call */

	bool			send_pages;	/* T if data from mapping should be sent */

	bool			need_attention;	/* T if RxRPC poked us */

	bool			async;		/* T if asynchronous */

	u16			service_id;	/* RxRPC service ID to call */

	__be16			port;		/* target UDP port */

	u32			operation_ID;	/* operation ID for an incoming call */
@@ -527,50 +510,37 @@ extern int afs_flock(struct file *, int, struct file_lock *); 
 */

extern int afs_fs_fetch_file_status(struct afs_server *, struct key *,

				    struct afs_vnode *, struct afs_volsync *,

				    const struct afs_wait_mode *);

extern int afs_fs_give_up_callbacks(struct afs_server *,

				    const struct afs_wait_mode *);

				    bool);

extern int afs_fs_give_up_callbacks(struct afs_server *, bool);

extern int afs_fs_fetch_data(struct afs_server *, struct key *,

			     struct afs_vnode *, struct afs_read *,

			     const struct afs_wait_mode *);

			     struct afs_vnode *, struct afs_read *, bool);

extern int afs_fs_create(struct afs_server *, struct key *,

			 struct afs_vnode *, const char *, umode_t,

			 struct afs_fid *, struct afs_file_status *,

			 struct afs_callback *,

			 const struct afs_wait_mode *);

			 struct afs_callback *, bool);

extern int afs_fs_remove(struct afs_server *, struct key *,

			 struct afs_vnode *, const char *, bool,

			 const struct afs_wait_mode *);

			 struct afs_vnode *, const char *, bool, bool);

extern int afs_fs_link(struct afs_server *, struct key *, struct afs_vnode *,

		       struct afs_vnode *, const char *,

		       const struct afs_wait_mode *);

		       struct afs_vnode *, const char *, bool);

extern int afs_fs_symlink(struct afs_server *, struct key *,

			  struct afs_vnode *, const char *, const char *,

			  struct afs_fid *, struct afs_file_status *,

			  const struct afs_wait_mode *);

			  struct afs_fid *, struct afs_file_status *, bool);

extern int afs_fs_rename(struct afs_server *, struct key *,

			 struct afs_vnode *, const char *,

			 struct afs_vnode *, const char *,

			 const struct afs_wait_mode *);

			 struct afs_vnode *, const char *, bool);

extern int afs_fs_store_data(struct afs_server *, struct afs_writeback *,

			     pgoff_t, pgoff_t, unsigned, unsigned,

			     const struct afs_wait_mode *);

			     pgoff_t, pgoff_t, unsigned, unsigned, bool);

extern int afs_fs_setattr(struct afs_server *, struct key *,

			  struct afs_vnode *, struct iattr *,

			  const struct afs_wait_mode *);

			  struct afs_vnode *, struct iattr *, bool);

extern int afs_fs_get_volume_status(struct afs_server *, struct key *,

				    struct afs_vnode *,

				    struct afs_volume_status *,

				    const struct afs_wait_mode *);

				    struct afs_volume_status *, bool);

extern int afs_fs_set_lock(struct afs_server *, struct key *,

			   struct afs_vnode *, afs_lock_type_t,

			   const struct afs_wait_mode *);

			   struct afs_vnode *, afs_lock_type_t, bool);

extern int afs_fs_extend_lock(struct afs_server *, struct key *,

			      struct afs_vnode *,

			      const struct afs_wait_mode *);

			      struct afs_vnode *, bool);

extern int afs_fs_release_lock(struct afs_server *, struct key *,

			       struct afs_vnode *,

			       const struct afs_wait_mode *);

			       struct afs_vnode *, bool);



/*

 * inode.c
@@ -624,8 +594,7 @@ extern struct socket *afs_socket; 


extern int afs_open_socket(void);

extern void afs_close_socket(void);

extern int afs_make_call(struct in_addr *, struct afs_call *, gfp_t,

			 const struct afs_wait_mode *);

extern int afs_make_call(struct in_addr *, struct afs_call *, gfp_t, bool);

extern struct afs_call *afs_alloc_flat_call(const struct afs_call_type *,

					    size_t, size_t);

extern void afs_flat_call_destructor(struct afs_call *);
@@ -681,11 +650,10 @@ extern int afs_get_MAC_address(u8 *, size_t); 
 */

extern int afs_vl_get_entry_by_name(struct in_addr *, struct key *,

				    const char *, struct afs_cache_vlocation *,

				    const struct afs_wait_mode *);

				    bool);

extern int afs_vl_get_entry_by_id(struct in_addr *, struct key *,

				  afs_volid_t, afs_voltype_t,

				  struct afs_cache_vlocation *,

				  const struct afs_wait_mode *);

				  struct afs_cache_vlocation *, bool);



/*

 * vlocation.c

fs/afs/rxrpc.c

+12 −39
Original line number Diff line number Diff line
@@ -25,29 +25,11 @@ static void afs_free_call(struct afs_call *); 
static void afs_wake_up_call_waiter(struct sock *, struct rxrpc_call *, unsigned long);

static int afs_wait_for_call_to_complete(struct afs_call *);

static void afs_wake_up_async_call(struct sock *, struct rxrpc_call *, unsigned long);

static int afs_dont_wait_for_call_to_complete(struct afs_call *);

static void afs_process_async_call(struct work_struct *);

static void afs_rx_new_call(struct sock *, struct rxrpc_call *, unsigned long);

static void afs_rx_discard_new_call(struct rxrpc_call *, unsigned long);

static int afs_deliver_cm_op_id(struct afs_call *);



/* synchronous call management */

const struct afs_wait_mode afs_sync_call = {

	.notify_rx	= afs_wake_up_call_waiter,

	.wait		= afs_wait_for_call_to_complete,

};



/* asynchronous call management */

const struct afs_wait_mode afs_async_call = {

	.notify_rx	= afs_wake_up_async_call,

	.wait		= afs_dont_wait_for_call_to_complete,

};



/* asynchronous incoming call management */

static const struct afs_wait_mode afs_async_incoming_call = {

	.notify_rx	= afs_wake_up_async_call,

};



/* asynchronous incoming call initial processing */

static const struct afs_call_type afs_RXCMxxxx = {

	.name		= "CB.xxxx",
@@ -315,7 +297,7 @@ static int afs_send_pages(struct afs_call *call, struct msghdr *msg, 
 * initiate a call

 */

int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp,

		  const struct afs_wait_mode *wait_mode)

		  bool async)

{

	struct sockaddr_rxrpc srx;

	struct rxrpc_call *rxcall;
@@ -332,7 +314,7 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp, 
	       call, call->type->name, key_serial(call->key),

	       atomic_read(&afs_outstanding_calls));



	call->wait_mode = wait_mode;

	call->async = async;

	INIT_WORK(&call->async_work, afs_process_async_call);



	memset(&srx, 0, sizeof(srx));
@@ -347,7 +329,9 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp, 
	/* create a call */

	rxcall = rxrpc_kernel_begin_call(afs_socket, &srx, call->key,

					 (unsigned long) call, gfp,

					 wait_mode->notify_rx);

					 (async ?

					  afs_wake_up_async_call :

					  afs_wake_up_call_waiter));

	call->key = NULL;

	if (IS_ERR(rxcall)) {

		ret = PTR_ERR(rxcall);
@@ -386,7 +370,10 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp, 


	/* at this point, an async call may no longer exist as it may have

	 * already completed */

	return wait_mode->wait(call);

	if (call->async)

		return -EINPROGRESS;



	return afs_wait_for_call_to_complete(call);



error_do_abort:

	rxrpc_kernel_abort_call(afs_socket, rxcall, RX_USER_ABORT, -ret, "KSD");
@@ -548,17 +535,6 @@ static void afs_wake_up_async_call(struct sock *sk, struct rxrpc_call *rxcall, 
	queue_work(afs_async_calls, &call->async_work);

}



/*

 * put a call into asynchronous mode

 * - mustn't touch the call descriptor as the call my have completed by the

 *   time we get here

 */

static int afs_dont_wait_for_call_to_complete(struct afs_call *call)

{

	_enter("");

	return -EINPROGRESS;

}



/*

 * delete an asynchronous call

 */
@@ -587,10 +563,7 @@ static void afs_process_async_call(struct work_struct *work) 
		afs_deliver_to_call(call);

	}



	if (call->state == AFS_CALL_COMPLETE && call->wait_mode) {

		if (call->wait_mode->async_complete)

			call->wait_mode->async_complete(call->reply,

							call->error);

	if (call->state == AFS_CALL_COMPLETE) {

		call->reply = NULL;



		/* kill the call */
@@ -626,10 +599,10 @@ static void afs_charge_preallocation(struct work_struct *work) 
				break;



			INIT_WORK(&call->async_work, afs_process_async_call);

			call->wait_mode = &afs_async_incoming_call;

			call->type = &afs_RXCMxxxx;

			init_waitqueue_head(&call->waitq);

			call->async = true;

			call->state = AFS_CALL_AWAIT_OP_ID;

			init_waitqueue_head(&call->waitq);

		}



		if (rxrpc_kernel_charge_accept(afs_socket,

fs/afs/vlclient.c

+4 −4
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int afs_vl_get_entry_by_name(struct in_addr *addr, 
			     struct key *key,

			     const char *volname,

			     struct afs_cache_vlocation *entry,

			     const struct afs_wait_mode *wait_mode)

			     bool async)

{

	struct afs_call *call;

	size_t volnamesz, reqsz, padsz;
@@ -177,7 +177,7 @@ int afs_vl_get_entry_by_name(struct in_addr *addr, 
		memset((void *) bp + volnamesz, 0, padsz);



	/* initiate the call */

	return afs_make_call(addr, call, GFP_KERNEL, wait_mode);

	return afs_make_call(addr, call, GFP_KERNEL, async);

}



/*
@@ -188,7 +188,7 @@ int afs_vl_get_entry_by_id(struct in_addr *addr, 
			   afs_volid_t volid,

			   afs_voltype_t voltype,

			   struct afs_cache_vlocation *entry,

			   const struct afs_wait_mode *wait_mode)

			   bool async)

{

	struct afs_call *call;

	__be32 *bp;
@@ -211,5 +211,5 @@ int afs_vl_get_entry_by_id(struct in_addr *addr, 
	*bp   = htonl(voltype);



	/* initiate the call */

	return afs_make_call(addr, call, GFP_KERNEL, wait_mode);

	return afs_make_call(addr, call, GFP_KERNEL, async);

}