Merge x86-64 update from Andi

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

diff --git a/fs/9p/mux.h b/fs/9p/mux.h
index d7d8fa1c15291eec062507fad5d9a9ce6ec29c63..4994cb10badfef1498931d85928a5fb140960e7b 100644 (file)
--- a/fs/9p/mux.h
+++ b/fs/9p/mux.h
@@ -28,6 +28,7 @@
 struct v9fs_rpcreq {
        struct v9fs_fcall *tcall;
        struct v9fs_fcall *rcall;
+       int err;        /* error code if response failed */
 
        /* XXX - could we put scatter/gather buffers here? */
 
@@ -37,3 +38,4 @@ struct v9fs_rpcreq {
 int v9fs_mux_init(struct v9fs_session_info *v9ses, const char *dev_name);
 long v9fs_mux_rpc(struct v9fs_session_info *v9ses,
                  struct v9fs_fcall *tcall, struct v9fs_fcall **rcall);
+void v9fs_mux_cancel_requests(struct v9fs_session_info *v9ses, int err);