patch-2.1.69 linux/fs/smbfs/sock.c

Next file: linux/fs/super.c
Previous file: linux/fs/nfsd/vfs.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.68/linux/fs/smbfs/sock.c linux/fs/smbfs/sock.c
@@ -87,7 +87,7 @@
 	struct socket *socket = sk->socket;
 	unsigned char peek_buf[4];
 	int result;
-	unsigned long fs;
+	mm_segment_t fs;
 
 	fs = get_fs();
 	set_fs(get_ds());
@@ -322,7 +322,7 @@
 {
 	int result;
 	unsigned char peek_buf[4];
-	unsigned long fs;
+	mm_segment_t fs;
 
       re_recv:
 	fs = get_fs();
@@ -597,7 +597,8 @@
 int
 smb_request(struct smb_sb_info *server)
 {
-	unsigned long fs, flags, sigpipe;
+	unsigned long flags, sigpipe;
+	mm_segment_t fs;
 	sigset_t old_set;
 	int len, result;
 	unsigned char *buffer;
@@ -768,7 +769,8 @@
 		   int *lrparam, unsigned char **rparam)
 {
 	sigset_t old_set;
-	unsigned long fs, flags, sigpipe;
+	unsigned long flags, sigpipe;
+	mm_segment_t fs;
 	int result;
 
 	pr_debug("smb_trans2_request: com=%d, ld=%d, lp=%d\n",

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