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

Next file: linux/include/linux/net.h
Previous file: linux/include/linux/ncp_fs_sb.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.30/linux/include/linux/ncp_mount.h linux/include/linux/ncp_mount.h
@@ -13,40 +13,28 @@
 #include <linux/ncp.h>
 #include <linux/ncp_fs_i.h>
 
-#define NCP_MOUNT_VERSION 2
-
-#define NCP_USERNAME_LEN (NCP_BINDERY_NAME_LEN)
-#define NCP_PASSWORD_LEN 20
+#define NCP_MOUNT_VERSION 3
 
 /* Values for flags */
 #define NCP_MOUNT_SOFT 0x0001
 #define NCP_MOUNT_INTR 0x0002
 
-/* Gosh... */
-#define NCP_PATH_MAX 1024
-
 struct ncp_mount_data {
 	int version;
 	unsigned int ncp_fd;	/* The socket to the ncp port */
-	unsigned int wdog_fd;	/* Watchdog packets come here */
-	unsigned int message_fd; /* Message notifications come here */
-        uid_t mounted_uid;      /* Who may umount() this filesystem? */
-
-	struct sockaddr_ipx serv_addr;
-	unsigned char server_name[NCP_BINDERY_NAME_LEN];
-
-	unsigned char mount_point[NCP_PATH_MAX+1];
-	unsigned char mounted_vol[NCP_VOLNAME_LEN+1];
+	uid_t mounted_uid;	/* Who may umount() this filesystem? */
+	pid_t wdog_pid;		/* Who cares for our watchdog packets? */
 
+	unsigned char mounted_vol[NCP_VOLNAME_LEN + 1];
 	unsigned int time_out;	/* How long should I wait after
 				   sending a NCP request? */
-	unsigned int retry_count; /* And how often should I retry? */
+	unsigned int retry_count;	/* And how often should I retry? */
 	unsigned int flags;
 
-        uid_t uid;
-        gid_t gid;
-        mode_t file_mode;
-        mode_t dir_mode;
+	uid_t uid;
+	gid_t gid;
+	mode_t file_mode;
+	mode_t dir_mode;
 };
 
 #endif

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