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

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

Merge tag 'rxrpc-rewrite-20170109' of... 

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



David Howells says:

====================
afs: Refcount afs_call struct

These patches provide some tracepoints for AFS and fix a potential leak by
adding refcounting to the afs_call struct.

The patches are:

 (1) Add some tracepoints for logging incoming calls and monitoring
     notifications from AF_RXRPC and data reception.

 (2) Get rid of afs_wait_mode as it didn't turn out to be as useful as
     initially expected.  It can be brought back later if needed.  This
     clears some stuff out that I don't then need to fix up in (4).

 (3) Allow listen(..., 0) to be used to disable listening.  This makes
     shutting down the AFS cache manager server in the kernel much easier
     and the accounting simpler as we can then be sure that (a) all
     preallocated afs_call structs are relesed and (b) no new incoming
     calls are going to be started.

     For the moment, listening cannot be reenabled.

 (4) Add refcounting to the afs_call struct to fix a potential multiple
     release detected by static checking and add a tracepoint to follow the
     lifecycle of afs_call objects.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 73517885 341f741f

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/cmservice.c

+38 −25
Original line number Diff line number Diff line
@@ -24,65 +24,86 @@ static int afs_deliver_cb_callback(struct afs_call *); 
static int afs_deliver_cb_probe_uuid(struct afs_call *);

static int afs_deliver_cb_tell_me_about_yourself(struct afs_call *);

static void afs_cm_destructor(struct afs_call *);

static void SRXAFSCB_CallBack(struct work_struct *);

static void SRXAFSCB_InitCallBackState(struct work_struct *);

static void SRXAFSCB_Probe(struct work_struct *);

static void SRXAFSCB_ProbeUuid(struct work_struct *);

static void SRXAFSCB_TellMeAboutYourself(struct work_struct *);



#define CM_NAME(name) \

	const char afs_SRXCB##name##_name[] __tracepoint_string =	\

		"CB." #name



/*

 * CB.CallBack operation type

 */

static CM_NAME(CallBack);

static const struct afs_call_type afs_SRXCBCallBack = {

	.name		= "CB.CallBack",

	.name		= afs_SRXCBCallBack_name,

	.deliver	= afs_deliver_cb_callback,

	.abort_to_error	= afs_abort_to_error,

	.destructor	= afs_cm_destructor,

	.work		= SRXAFSCB_CallBack,

};



/*

 * CB.InitCallBackState operation type

 */

static CM_NAME(InitCallBackState);

static const struct afs_call_type afs_SRXCBInitCallBackState = {

	.name		= "CB.InitCallBackState",

	.name		= afs_SRXCBInitCallBackState_name,

	.deliver	= afs_deliver_cb_init_call_back_state,

	.abort_to_error	= afs_abort_to_error,

	.destructor	= afs_cm_destructor,

	.work		= SRXAFSCB_InitCallBackState,

};



/*

 * CB.InitCallBackState3 operation type

 */

static CM_NAME(InitCallBackState3);

static const struct afs_call_type afs_SRXCBInitCallBackState3 = {

	.name		= "CB.InitCallBackState3",

	.name		= afs_SRXCBInitCallBackState3_name,

	.deliver	= afs_deliver_cb_init_call_back_state3,

	.abort_to_error	= afs_abort_to_error,

	.destructor	= afs_cm_destructor,

	.work		= SRXAFSCB_InitCallBackState,

};



/*

 * CB.Probe operation type

 */

static CM_NAME(Probe);

static const struct afs_call_type afs_SRXCBProbe = {

	.name		= "CB.Probe",

	.name		= afs_SRXCBProbe_name,

	.deliver	= afs_deliver_cb_probe,

	.abort_to_error	= afs_abort_to_error,

	.destructor	= afs_cm_destructor,

	.work		= SRXAFSCB_Probe,

};



/*

 * CB.ProbeUuid operation type

 */

static CM_NAME(ProbeUuid);

static const struct afs_call_type afs_SRXCBProbeUuid = {

	.name		= "CB.ProbeUuid",

	.name		= afs_SRXCBProbeUuid_name,

	.deliver	= afs_deliver_cb_probe_uuid,

	.abort_to_error	= afs_abort_to_error,

	.destructor	= afs_cm_destructor,

	.work		= SRXAFSCB_ProbeUuid,

};



/*

 * CB.TellMeAboutYourself operation type

 */

static CM_NAME(TellMeAboutYourself);

static const struct afs_call_type afs_SRXCBTellMeAboutYourself = {

	.name		= "CB.TellMeAboutYourself",

	.name		= afs_SRXCBTellMeAboutYourself_name,

	.deliver	= afs_deliver_cb_tell_me_about_yourself,

	.abort_to_error	= afs_abort_to_error,

	.destructor	= afs_cm_destructor,

	.work		= SRXAFSCB_TellMeAboutYourself,

};



/*
@@ -153,6 +174,7 @@ static void SRXAFSCB_CallBack(struct work_struct *work) 
	afs_send_empty_reply(call);



	afs_break_callbacks(call->server, call->count, call->request);

	afs_put_call(call);

	_leave("");

}
@@ -274,9 +296,7 @@ static int afs_deliver_cb_callback(struct afs_call *call) 
		return -ENOTCONN;

	call->server = server;



	INIT_WORK(&call->work, SRXAFSCB_CallBack);

	queue_work(afs_wq, &call->work);

	return 0;

	return afs_queue_call_work(call);

}



/*
@@ -290,6 +310,7 @@ static void SRXAFSCB_InitCallBackState(struct work_struct *work) 


	afs_init_callback_state(call->server);

	afs_send_empty_reply(call);

	afs_put_call(call);

	_leave("");

}
@@ -320,9 +341,7 @@ static int afs_deliver_cb_init_call_back_state(struct afs_call *call) 
		return -ENOTCONN;

	call->server = server;



	INIT_WORK(&call->work, SRXAFSCB_InitCallBackState);

	queue_work(afs_wq, &call->work);

	return 0;

	return afs_queue_call_work(call);

}



/*
@@ -394,9 +413,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call) 
		return -ENOTCONN;

	call->server = server;



	INIT_WORK(&call->work, SRXAFSCB_InitCallBackState);

	queue_work(afs_wq, &call->work);

	return 0;

	return afs_queue_call_work(call);

}



/*
@@ -408,6 +425,7 @@ static void SRXAFSCB_Probe(struct work_struct *work) 


	_enter("");

	afs_send_empty_reply(call);

	afs_put_call(call);

	_leave("");

}
@@ -427,9 +445,7 @@ static int afs_deliver_cb_probe(struct afs_call *call) 
	/* no unmarshalling required */

	call->state = AFS_CALL_REPLYING;



	INIT_WORK(&call->work, SRXAFSCB_Probe);

	queue_work(afs_wq, &call->work);

	return 0;

	return afs_queue_call_work(call);

}



/*
@@ -452,6 +468,7 @@ static void SRXAFSCB_ProbeUuid(struct work_struct *work) 
		reply.match = htonl(1);



	afs_send_simple_reply(call, &reply, sizeof(reply));

	afs_put_call(call);

	_leave("");

}
@@ -510,9 +527,7 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call) 


	call->state = AFS_CALL_REPLYING;



	INIT_WORK(&call->work, SRXAFSCB_ProbeUuid);

	queue_work(afs_wq, &call->work);

	return 0;

	return afs_queue_call_work(call);

}



/*
@@ -574,7 +589,7 @@ static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work) 
	reply.cap.capcount = htonl(1);

	reply.cap.caps[0] = htonl(AFS_CAP_ERROR_TRANSLATION);

	afs_send_simple_reply(call, &reply, sizeof(reply));



	afs_put_call(call);

	_leave("");

}
@@ -594,7 +609,5 @@ static int afs_deliver_cb_tell_me_about_yourself(struct afs_call *call) 
	/* no unmarshalling required */

	call->state = AFS_CALL_REPLYING;



	INIT_WORK(&call->work, SRXAFSCB_TellMeAboutYourself);

	queue_work(afs_wq, &call->work);

	return 0;

	return afs_queue_call_work(call);

}

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

+37 −59
Original line number Diff line number Diff line
@@ -51,31 +51,22 @@ 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);

enum afs_call_state {

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

	AFS_CALL_AWAIT_REPLY,	/* awaiting reply to outgoing call */

	AFS_CALL_AWAIT_OP_ID,	/* awaiting op ID on incoming call */

	AFS_CALL_AWAIT_REQUEST,	/* awaiting request data on incoming call */

	AFS_CALL_REPLYING,	/* replying to incoming call */

	AFS_CALL_AWAIT_ACK,	/* awaiting final ACK of incoming call */

	AFS_CALL_COMPLETE,	/* Completed or failed */

};



extern const struct afs_wait_mode afs_sync_call;

extern const struct afs_wait_mode afs_async_call;



/*

 * a record of an in-progress RxRPC call

 */

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	async_work;	/* async I/O processor */

	struct work_struct	work;		/* actual work processor */

	struct rxrpc_call	*rxcall;	/* RxRPC call handle */

	struct key		*key;		/* security for this call */
@@ -91,15 +82,8 @@ struct afs_call { 
	pgoff_t			first;		/* first page in mapping to deal with */

	pgoff_t			last;		/* last page in mapping to deal with */

	size_t			offset;		/* offset into received data store */

	enum {					/* call state */

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

		AFS_CALL_AWAIT_REPLY,	/* awaiting reply to outgoing call */

		AFS_CALL_AWAIT_OP_ID,	/* awaiting op ID on incoming call */

		AFS_CALL_AWAIT_REQUEST,	/* awaiting request data on incoming call */

		AFS_CALL_REPLYING,	/* replying to incoming call */

		AFS_CALL_AWAIT_ACK,	/* awaiting final ACK of incoming call */

		AFS_CALL_COMPLETE,	/* Completed or failed */

	}			state;

	atomic_t		usage;

	enum afs_call_state	state;

	int			error;		/* error code */

	u32			abort_code;	/* Remote abort ID or 0 */

	unsigned		request_size;	/* size of request data */
@@ -110,6 +94,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 */
@@ -131,6 +116,9 @@ struct afs_call_type { 


	/* clean up a call */

	void (*destructor)(struct afs_call *call);



	/* Work function */

	void (*work)(struct work_struct *work);

};



/*
@@ -526,50 +514,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
@@ -620,11 +595,13 @@ extern void afs_proc_cell_remove(struct afs_cell *); 
 * rxrpc.c

 */

extern struct socket *afs_socket;

extern atomic_t afs_outstanding_calls;



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 void afs_put_call(struct afs_call *);

extern int afs_queue_call_work(struct afs_call *);

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 *);
@@ -680,11 +657,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
@@ -773,6 +749,8 @@ extern int afs_fsync(struct file *, loff_t, loff_t, int); 
/*

 * debug tracing

 */

#include <trace/events/afs.h>



extern unsigned afs_debug;



#define dbgprintk(FMT,...) \

fs/afs/main.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/completion.h>

#include <linux/sched.h>

#include <linux/random.h>

#define CREATE_TRACE_POINTS

#include "internal.h"



MODULE_DESCRIPTION("AFS Client File System");