patch-2.1.31 linux/include/linux/ncp_fs_sb.h

Next file: linux/include/linux/ncp_mount.h
Previous file: linux/include/linux/ncp_fs_i.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.30/linux/include/linux/ncp_fs_sb.h linux/include/linux/ncp_fs_sb.h
@@ -17,60 +17,52 @@
 
 struct ncp_server {
 
-	struct ncp_mount_data m; /* Nearly all of the mount data is of
-				    interest for us later, so we store
-				    it completely. */
+	struct ncp_mount_data m;	/* Nearly all of the mount data is of
+					   interest for us later, so we store
+					   it completely. */
 
 	__u8 name_space[NCP_NUMBER_OF_VOLUMES];
 
 	struct file *ncp_filp;	/* File pointer to ncp socket */
-	struct file *wdog_filp;	/* File pointer to wdog socket */
-	struct file *msg_filp;	/* File pointer to message socket */
-	void *data_ready;	/* The wdog socket gets a new
-				   data_ready callback. We store the
-				   old one for checking purposes and
-				   to reset it on unmounting. */
-
-	u8         sequence;
-	u8         task;
-	u16        connection;	/* Remote connection number */
 
-	u8         completion;	/* Status message from server */
-	u8         conn_status;	/* Bit 4 = 1 ==> Server going down, no
+	u8 sequence;
+	u8 task;
+	u16 connection;		/* Remote connection number */
+
+	u8 completion;		/* Status message from server */
+	u8 conn_status;		/* Bit 4 = 1 ==> Server going down, no
 				   requests allowed anymore.
 				   Bit 0 = 1 ==> Server is down. */
 
-	int        buffer_size;	/* Negotiated bufsize */
+	int buffer_size;	/* Negotiated bufsize */
 
-	int        reply_size;	/* Size of last reply */
+	int reply_size;		/* Size of last reply */
 
-	int        packet_size;
+	int packet_size;
 	unsigned char *packet;	/* Here we prepare requests and
 				   receive replies */
 
-	int        lock;	/* To prevent mismatch in protocols. */
+	int lock;		/* To prevent mismatch in protocols. */
 	struct wait_queue *wait;
 
-	int        current_size; /* for packet preparation */
-	int        has_subfunction;
-	int        ncp_reply_size;
+	int current_size;	/* for packet preparation */
+	int has_subfunction;
+	int ncp_reply_size;
 
-        struct ncp_inode_info root;
-	char       root_path;	/* '\0' */
+	struct ncp_inode_info root;
+	char root_path;		/* '\0' */
 };
 
-static inline int
-ncp_conn_valid(struct ncp_server *server)
+static inline int ncp_conn_valid(struct ncp_server *server)
 {
 	return ((server->conn_status & 0x11) == 0);
 }
 
-static inline void
-ncp_invalidate_conn(struct ncp_server *server)
+static inline void ncp_invalidate_conn(struct ncp_server *server)
 {
 	server->conn_status |= 0x01;
 }
 
-#endif /* __KERNEL__ */
+#endif				/* __KERNEL__ */
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov