Home » Mailing list archives » linux-kernel » 2007 » November » 1

[PATCH 03/27] kill do_filp_open()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Dave Hansen <haveblue@...>
To: <akpm@...>
Cc: <linux-kernel@...>, <miklos@...>, <hch@...>, Dave Hansen <haveblue@...>
Subject: [PATCH 03/27] kill do_filp_open()
Date: Thursday, November 1, 2007 - 7:08 pm

This kills off the almost empty do_filp_open().  The indenting
change in do_sys_open() is because we would have gone over our
80 characters otherwise.

Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 linux-2.6.git-dave/fs/open.c |   39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff -puN fs/open.c~kill-do_filp_open fs/open.c
--- linux-2.6.git/fs/open.c~kill-do_filp_open	2007-11-01 14:46:06.000000000 -0700
+++ linux-2.6.git-dave/fs/open.c	2007-11-01 14:46:06.000000000 -0700
@@ -800,17 +800,10 @@ cleanup_file:
 	return ERR_PTR(error);
 }
 
-static struct file *do_filp_open(int dfd, const char *filename, int flags,
-				 int mode)
-{
-	struct nameidata nd;
-
-	return open_namei(dfd, filename, flags, mode, &nd);
-}
-
 struct file *filp_open(const char *filename, int flags, int mode)
 {
-	return do_filp_open(AT_FDCWD, filename, flags, mode);
+	struct nameidata nd;
+	return open_namei(AT_FDCWD, filename, flags, mode, &nd);
 }
 EXPORT_SYMBOL(filp_open);
 
@@ -1009,20 +1002,24 @@ long do_sys_open(int dfd, const char __u
 	char *tmp = getname(filename);
 	int fd = PTR_ERR(tmp);
 
-	if (!IS_ERR(tmp)) {
-		fd = get_unused_fd_flags(flags);
-		if (fd >= 0) {
-			struct file *f = do_filp_open(dfd, tmp, flags, mode);
-			if (IS_ERR(f)) {
-				put_unused_fd(fd);
-				fd = PTR_ERR(f);
-			} else {
-				fsnotify_open(f->f_path.dentry);
-				fd_install(fd, f);
-			}
+	if (IS_ERR(tmp))
+		goto out;
+
+	fd = get_unused_fd_flags(flags);
+	if (fd >= 0) {
+		struct nameidata nd;
+		struct file *f = open_namei(dfd, tmp, flags, mode, &nd);
+
+		if (IS_ERR(f)) {
+			put_unused_fd(fd);
+			fd = PTR_ERR(f);
+		} else {
+			fsnotify_open(f->f_path.dentry);
+			fd_install(fd, f);
 		}
-		putname(tmp);
 	}
+	putname(tmp);
+out:
 	return fd;
 }
 
_
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/27] Read-only bind mounts (-mm resend), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 27/27] keep track of mnt_writer state of struct file, Dave Hansen, (Thu Nov 1, 7:09 pm)
[PATCH 25/27] r-o-bind-mounts-track-number-of-mount-writers-..., Dave Hansen, (Thu Nov 1, 7:09 pm)
Re: [PATCH 25/27] r-o-bind-mounts-track-number-of-mount-writ..., Andrew Morton, (Mon Nov 5, 7:35 pm)
[PATCH 22/27] r-o-bind-mounts-nfs-check-mnt-instead-of-super..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 24/27] r-o-bind-mounts-track-number-of-mount-writers, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 26/27] r-o-bind-mounts-honor-r-w-changes-at-do_remoun..., Dave Hansen, (Thu Nov 1, 7:09 pm)
[PATCH 19/27] r-o-bind-mounts-elevate-writer-count-for-chown..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 23/27] r-o-bind-mounts-sys_mknodat-elevate-write-coun..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 18/27] r-o-bind-mounts-elevate-write-count-over-calls..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 21/27] r-o-bind-mounts-make-access-use-mnt-check, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 20/27] r-o-bind-mounts-elevate-writer-count-for-do_sy..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 17/27] r-o-bind-mounts-elevate-write-count-opend-files, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-some-i..., Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Andrew Morton, (Mon Nov 5, 7:23 pm)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Jan Kara, (Tue Nov 6, 5:01 am)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Andrew Morton, (Tue Nov 6, 5:12 am)
[PATCH 13/27] r-o-bind-mounts-elevate-write-count-for-do_uti..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 15/27] r-o-bind-mounts-elevate-write-count-for-link-a..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 12/27] r-o-bind-mounts-elevate-write-count-for-do_sys..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 11/27] r-o-bind-mounts-elevate-write-count-during-ent..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 14/27] r-o-bind-mounts-elevate-write-count-for-file_u..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 07/27] r-o-bind-mounts-do_rmdir-elevate-write-count, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 10/27] r-o-bind-mounts-elevate-mount-count-for-extend..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 01/27] do namei_flags calculation inside open_namei(), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 09/27] r-o-bind-mounts-elevate-mnt-writers-for-vfs_un..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 06/27] r-o-bind-mounts-stub-functions, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 08/27] r-o-bind-mounts-elevate-mnt-writers-for-caller..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 05/27] rename open_namei() to open_pathname(), Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 05/27] rename open_namei() to open_pathname(), Christoph Hellwig, (Mon Nov 26, 10:33 am)
[PATCH 04/27] kill filp_open(), Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 04/27] kill filp_open(), Andrew Morton, (Wed Jan 16, 4:52 am)
Re: [PATCH 04/27] kill filp_open(), Dave Hansen, (Wed Jan 16, 1:04 pm)
Re: [PATCH 04/27] kill filp_open(), Bryn M. Reeves, (Wed Jan 16, 1:12 pm)
Re: [PATCH 04/27] kill filp_open(), Christoph Hellwig, (Wed Jan 16, 1:10 pm)
Re: [PATCH 04/27] kill filp_open(), Dave Hansen, (Wed Jan 16, 1:41 pm)
Re: [PATCH 04/27] kill filp_open(), Christoph Hellwig, (Wed Jan 16, 1:47 pm)
[PATCH 03/27] kill do_filp_open(), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 02/27] make open_namei() return a filp, Dave Hansen, (Thu Nov 1, 7:08 pm)