patch-2.4.0-test3 linux/arch/sparc/kernel/sys_sunos.c

• Lines: 355
• Date: Sat Jul 8 19:26:12 2000
• Orig file: v2.4.0-test2/linux/arch/sparc/kernel/sys_sunos.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/arch/sparc/kernel/sys_sunos.c linux/arch/sparc/kernel/sys_sunos.c
@@ -1,4 +1,4 @@
-/* $Id: sys_sunos.c,v 1.125 2000/06/22 11:42:25 davem Exp $
+/* $Id: sys_sunos.c,v 1.128 2000/07/06 01:41:29 davem Exp $
  * sys_sunos.c: SunOS specific syscall compatibility support.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -68,8 +68,6 @@
 	struct file * file = NULL;
 	unsigned long retval, ret_type;
 
-	down(&current->mm->mmap_sem);
-	lock_kernel();
 	if(flags & MAP_NORESERVE) {
 		static int cnt;
 		if (cnt++ < 10)
@@ -118,7 +116,9 @@
 	}
 
 	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
+	down(&current->mm->mmap_sem);
 	retval = do_mmap(file, addr, len, prot, flags, off);
+	up(&current->mm->mmap_sem);
 	if(!ret_type)
 		retval = ((retval < PAGE_OFFSET) ? 0 : retval);
 
@@ -126,8 +126,6 @@
 	if (file)
 		fput(file);
 out:
-	unlock_kernel();
-	up(&current->mm->mmap_sem);
 	return retval;
 }
 
@@ -363,7 +361,6 @@
 	if (!file)
 		goto out;
 
-	lock_kernel();
 	error = -EINVAL;
 	if (cnt < (sizeof(struct sunos_dirent) + 255))
 		goto out_putf;
@@ -385,7 +382,6 @@
 	}
 
 out_putf:
-	unlock_kernel();
 	fput(file);
 out:
 	return error;
@@ -444,7 +440,6 @@
 	if (!file)
 		goto out;
 
-	lock_kernel();
 	error = -EINVAL;
 	if(cnt < (sizeof(struct sunos_direntry) + 255))
 		goto out_putf;
@@ -466,7 +461,6 @@
 	}
 
 out_putf:
-	unlock_kernel();
 	fput(file);
 out:
 	return error;
@@ -527,7 +521,6 @@
 {
 	int ret;
 
-	lock_kernel();
 	switch(name) {
 	case _PCONF_LINK:
 		ret = LINK_MAX;
@@ -558,7 +551,6 @@
 		ret = -EINVAL;
 		break;
 	}
-	unlock_kernel();
 	return ret;
 }
 
@@ -566,9 +558,7 @@
 {
 	int ret;
 
-	lock_kernel();
 	ret = sunos_fpathconf(0, name); /* XXX cheese XXX */
-	unlock_kernel();
 	return ret;
 }
 
@@ -581,7 +571,6 @@
 	int ret;
 
 	/* SunOS binaries expect that select won't change the tvp contents */
-	lock_kernel();
 	ret = sys_select (width, inp, outp, exp, tvp);
 	if (ret == -EINTR && tvp) {
 		time_t sec, usec;
@@ -592,7 +581,6 @@
 		if (sec == 0 && usec == 0)
 			ret = 0;
 	}
-	unlock_kernel();
 	return ret;
 }
 
@@ -658,6 +646,8 @@
 	if (!file)
 		goto out;
 
+	inode = file->f_dentry->d_inode;
+
 	socket = &inode->u.socket_i;
 	local.sin_family = AF_INET;
 	local.sin_addr.s_addr = INADDR_ANY;
@@ -833,7 +823,6 @@
 	int ret;
 
 	/* So stupid... */
-	lock_kernel();
 	if((!pid || pid == current->pid) &&
 	   !pgid) {
 		sys_setsid();
@@ -841,7 +830,6 @@
 	} else {
 		ret = sys_setpgid(pid, pgid);
 	}
-	unlock_kernel();
 	return ret;
 }
 
@@ -851,9 +839,7 @@
 {
 	int ret;
 
-	lock_kernel();
 	ret = sys_wait4((pid ? pid : -1), stat_addr, options, ru);
-	unlock_kernel();
 	return ret;
 }
 
@@ -901,7 +887,6 @@
 {
 	long ret;
 
-	lock_kernel();
 	switch (name){
 	case _SC_ARG_MAX:
 		ret = ARG_MAX;
@@ -934,7 +919,6 @@
 		ret = -1;
 		break;
 	};
-	unlock_kernel();
 	return ret;
 }
 
@@ -944,7 +928,6 @@
 	union semun arg4;
 	int ret;
 
-	lock_kernel();
 	switch (op) {
 	case 0:
 		/* Most arguments match on a 1:1 basis but cmd doesn't */
@@ -980,7 +963,6 @@
 		ret = -EINVAL;
 		break;
 	};
-	unlock_kernel();
 	return ret;
 }
 
@@ -991,7 +973,6 @@
 	unsigned long arg5;
 	int rval;
 
-	lock_kernel();
 	switch(op) {
 	case 0:
 		rval = sys_msgget((key_t)arg1, (int)arg2);
@@ -1001,8 +982,10 @@
 				  (struct msqid_ds *)arg3);
 		break;
 	case 2:
+		lock_kernel();
 		sp = (struct sparc_stackf *)current->thread.kregs->u_regs[UREG_FP];
 		arg5 = sp->xxargs[0];
+		unlock_kernel();
 		rval = sys_msgrcv((int)arg1, (struct msgbuf *)arg2,
 				  (size_t)arg3, (long)arg4, (int)arg5);
 		break;
@@ -1014,7 +997,6 @@
 		rval = -EINVAL;
 		break;
 	}
-	unlock_kernel();
 	return rval;
 }
 
@@ -1024,7 +1006,6 @@
 	unsigned long raddr;
 	int rval;
 
-	lock_kernel();
 	switch(op) {
 	case 0:
 		/* sys_shmat(): attach a shared memory area */
@@ -1048,7 +1029,6 @@
 		rval = -EINVAL;
 		break;
 	};
-	unlock_kernel();
 	return rval;
 }
 
@@ -1062,9 +1042,12 @@
 static inline int check_nonblock(int ret, int fd)
 {
 	if (ret == -EAGAIN) {
-		struct file * file = fcheck(fd);
-		if (file && (file->f_flags & O_NDELAY))
-			ret = -SUNOS_EWOULDBLOCK;
+		struct file * file = fget(fd);
+		if (file) {
+			if (file->f_flags & O_NDELAY)
+				ret = -SUNOS_EWOULDBLOCK;
+			fput(file);
+		}
 	}
 	return ret;
 }
@@ -1082,9 +1065,7 @@
 {
 	int ret;
 
-	lock_kernel();
 	ret = check_nonblock(sys_read(fd,buf,count),fd);
-	unlock_kernel();
 	return ret;
 }
 
@@ -1092,9 +1073,7 @@
 {
 	int ret;
 
-	lock_kernel();
 	ret = check_nonblock(sys_readv(fd,vector,count),fd);
-	unlock_kernel();
 	return ret;
 }
 
@@ -1102,9 +1081,7 @@
 {
 	int ret;
 
-	lock_kernel();
 	ret = check_nonblock(sys_write(fd,buf,count),fd);
-	unlock_kernel();
 	return ret;
 }
 
@@ -1112,9 +1089,7 @@
 {
 	int ret;
 
-	lock_kernel();
 	ret = check_nonblock(sys_writev(fd,vector,count),fd);
-	unlock_kernel();
 	return ret;
 }
 
@@ -1122,9 +1097,7 @@
 {
 	int ret;
 
-	lock_kernel();
 	ret = check_nonblock(sys_recv(fd,ubuf,size,flags),fd);
-	unlock_kernel();
 	return ret;
 }
 
@@ -1132,9 +1105,7 @@
 {
 	int ret;
 
-	lock_kernel();
 	ret = check_nonblock(sys_send(fd,buff,len,flags),fd);
-	unlock_kernel();
 	return ret;
 }
 
@@ -1145,7 +1116,6 @@
 {
 	int ret, one = 1;
 
-	lock_kernel();
 	ret = sys_socket(family, type, protocol);
 	if (ret < 0)
 		goto out;
@@ -1153,7 +1123,6 @@
 	sys_setsockopt(ret, SOL_SOCKET, SO_BSDCOMPAT,
 		       (char *)&one, sizeof(one));
 out:
-	unlock_kernel();
 	return ret;
 }
 
@@ -1161,7 +1130,6 @@
 {
 	int ret, one = 1;
 
-	lock_kernel();
 	while (1) {
 		ret = check_nonblock(sys_accept(fd,sa,addrlen),fd);	
 		if (ret != -ENETUNREACH && ret != -EHOSTUNREACH)
@@ -1173,7 +1141,6 @@
 	sys_setsockopt(ret, SOL_SOCKET, SO_BSDCOMPAT,
 		       (char *)&one, sizeof(one));
 out:
-	unlock_kernel();
 	return ret;
 }
 
@@ -1230,14 +1197,12 @@
 	int tr_opt = optname;
 	int ret;
 
-	lock_kernel();
 	if (level == SOL_IP) {
 		/* Multicast socketopts (ttl, membership) */
 		if (tr_opt >=2 && tr_opt <= 6)
 			tr_opt += 30;
 	}
 	ret = sys_setsockopt(fd, level, tr_opt, optval, optlen);
-	unlock_kernel();
 	return ret;
 }
 
@@ -1247,13 +1212,11 @@
 	int tr_opt = optname;
 	int ret;
 
-	lock_kernel();
 	if (level == SOL_IP) {
 		/* Multicast socketopts (ttl, membership) */
 		if (tr_opt >=2 && tr_opt <= 6)
 			tr_opt += 30;
 	}
 	ret = sys_getsockopt(fd, level, tr_opt, optval, optlen);
-	unlock_kernel();
 	return ret;
 }