linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / 9p / mux.h

diff --git a/fs/9p/mux.h b/fs/9p/mux.h
index fb10c50..9473b84 100644 (file)
--- a/fs/9p/mux.h
+++ b/fs/9p/mux.h
@@ -7,8 +7,9 @@
  *  Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2
- *  as published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,7 +25,6 @@
  */
 
 struct v9fs_mux_data;
-struct v9fs_req;
 
 /**
  * v9fs_mux_req_callback - callback function that is called when the
@@ -37,7 +37,8 @@ struct v9fs_req;
  * @rc - response call
  * @err - error code (non-zero if error occured)
  */
-typedef void (*v9fs_mux_req_callback)(struct v9fs_req *req, void *a);
+typedef void (*v9fs_mux_req_callback)(void *a, struct v9fs_fcall *tc,
+       struct v9fs_fcall *rc, int err);
 
 int v9fs_mux_global_init(void);
 void v9fs_mux_global_exit(void);
@@ -49,6 +50,8 @@ void v9fs_mux_destroy(struct v9fs_mux_data *);
 int v9fs_mux_send(struct v9fs_mux_data *m, struct v9fs_fcall *tc);
 struct v9fs_fcall *v9fs_mux_recv(struct v9fs_mux_data *m);
 int v9fs_mux_rpc(struct v9fs_mux_data *m, struct v9fs_fcall *tc, struct v9fs_fcall **rc);
+int v9fs_mux_rpcnb(struct v9fs_mux_data *m, struct v9fs_fcall *tc,
+       v9fs_mux_req_callback cb, void *a);
 
 void v9fs_mux_flush(struct v9fs_mux_data *m, int sendflush);
 void v9fs_mux_cancel(struct v9fs_mux_data *m, int err);