Make dupfd() locking more clear.

Walter Harms pointed out the locking was rather obtuse in dupfd. This
patch makes it much clearer.  Present code acquires a lock in dupfd()
callee locate_fd(), and releases it in allocate_fd() OR dupfd() itself.

This changes cleans this up to acquire and release the lock entirely
within dupfd(), which moves locking completely out of locate_fd()
and allows the manual inlining of allocate_fd() into its only caller,
dupfd().

This change is functionally equivalent to the current code
[well, dupfd might run a cycle or two faster if the compiler optimizes well...]

fs/fcntl.c

@@ -75,8 +75,8 @@ static int expand_files(struct files_struct *files, int nr)
 
 /*
  * locate_fd finds a free file descriptor in the open_fds fdset,
- * expanding the fd arrays if necessary.  The files write lock will be
- * held on exit to ensure that the fd can be entered atomically.
+ * expanding the fd arrays if necessary.  Must be called with the
+ * file_lock held for write.
  */
 
 static int locate_fd(struct files_struct *files, 
@@ -86,8 +86,6 @@ static int locate_fd(struct files_struct *files,
 	int error;
 	int start;
 
-	write_lock(&files->file_lock);
-	
 	error = -EINVAL;
 	if (orig_start >= current->rlim[RLIMIT_NOFILE].rlim_cur)
 		goto out;
@@ -131,30 +129,24 @@ static int locate_fd(struct files_struct *files,
 	return error;
 }
 
-static inline void allocate_fd(struct files_struct *files, 
-					struct file *file, int fd)
+static int dupfd(struct file *file, int start)
 {
+	struct files_struct * files = current->files;
+	int fd;
+
+	write_lock(&files->file_lock);
+	fd = locate_fd(files, file, start);
+	if (fd >= 0) {
 		FD_SET(fd, files->open_fds);
 		FD_CLR(fd, files->close_on_exec);
 		write_unlock(&files->file_lock);
 		fd_install(fd, file);
-}
-
-static int dupfd(struct file *file, int start)
-{
-	struct files_struct * files = current->files;
-	int ret;
-
-	ret = locate_fd(files, file, start);
-	if (ret < 0) 
-		goto out_putf;
-	allocate_fd(files, file, ret);
-	return ret;
-
-out_putf:
+	} else {
 		write_unlock(&files->file_lock);
 		fput(file);
-	return ret;
+	}
+
+	return fd;
 }
 
 asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd)