From: David Howells <dhowells@redhat.com>
To: hch@infradead.org, viro@ftp.linux.org.uk, torvalds@osdl.org,
akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
dhowells@redhat.com
Subject: [PATCH 22/30] IGET: Stop PROCFS from using iget() and read_inode()
Date: Mon, 01 Oct 2007 14:11:14 +0100 [thread overview]
Message-ID: <20071001131114.29339.60243.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20071001130921.29339.72876.stgit@warthog.procyon.org.uk>
Stop the PROCFS filesystem from using iget() and read_inode(). Merge
procfs_read_inode() into procfs_get_inode(), and have that call iget_locked()
instead of iget().
Signed-off-by: David Howells <dhowells@redhat.com>
---
fs/proc/inode.c | 60 ++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 0e4d37c..7a563c5 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -78,11 +78,6 @@ static void proc_delete_inode(struct inode *inode)
struct vfsmount *proc_mnt;
-static void proc_read_inode(struct inode * inode)
-{
- inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-}
-
static struct kmem_cache * proc_inode_cachep;
static struct inode *proc_alloc_inode(struct super_block *sb)
@@ -135,7 +130,6 @@ static int proc_remount(struct super_block *sb, int *flags, char *data)
static const struct super_operations proc_sops = {
.alloc_inode = proc_alloc_inode,
.destroy_inode = proc_destroy_inode,
- .read_inode = proc_read_inode,
.drop_inode = generic_delete_inode,
.delete_inode = proc_delete_inode,
.statfs = simple_statfs,
@@ -408,39 +402,41 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
if (de != NULL && !try_module_get(de->owner))
goto out_mod;
- inode = iget(sb, ino);
+ inode = iget_locked(sb, ino);
if (!inode)
goto out_ino;
-
- PROC_I(inode)->fd = 0;
- PROC_I(inode)->pde = de;
- if (de) {
- if (de->mode) {
- inode->i_mode = de->mode;
- inode->i_uid = de->uid;
- inode->i_gid = de->gid;
- }
- if (de->size)
- inode->i_size = de->size;
- if (de->nlink)
- inode->i_nlink = de->nlink;
- if (de->proc_iops)
- inode->i_op = de->proc_iops;
- if (de->proc_fops) {
- if (S_ISREG(inode->i_mode)) {
+ if (inode->i_state & I_NEW) {
+ inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+ PROC_I(inode)->fd = 0;
+ PROC_I(inode)->pde = de;
+ if (de) {
+ if (de->mode) {
+ inode->i_mode = de->mode;
+ inode->i_uid = de->uid;
+ inode->i_gid = de->gid;
+ }
+ if (de->size)
+ inode->i_size = de->size;
+ if (de->nlink)
+ inode->i_nlink = de->nlink;
+ if (de->proc_iops)
+ inode->i_op = de->proc_iops;
+ if (de->proc_fops) {
+ if (S_ISREG(inode->i_mode)) {
#ifdef CONFIG_COMPAT
- if (!de->proc_fops->compat_ioctl)
- inode->i_fop =
- &proc_reg_file_ops_no_compat;
- else
+ if (!de->proc_fops->compat_ioctl)
+ inode->i_fop =
+ &proc_reg_file_ops_no_compat;
+ else
#endif
- inode->i_fop = &proc_reg_file_ops;
+ inode->i_fop = &proc_reg_file_ops;
+ }
+ else
+ inode->i_fop = de->proc_fops;
}
- else
- inode->i_fop = de->proc_fops;
}
+ unlock_new_inode(inode);
}
-
return inode;
out_ino:
next prev parent reply other threads:[~2007-10-01 13:11 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-01 13:09 [PATCH 00/30] Remove iget() and read_inode() David Howells
2007-10-01 13:09 ` [PATCH 01/30] IGET: Introduce a function to register iget failure David Howells
2007-10-01 13:09 ` [PATCH 02/30] IGET: Use iget_failed() in AFS David Howells
2007-10-01 13:09 ` [PATCH 03/30] IGET: Use iget_failed() in GFS2 David Howells
2007-10-01 13:09 ` [PATCH 04/30] IGET: Mark iget() and read_inode() as being obsolete David Howells
2007-10-01 13:09 ` [PATCH 05/30] IGET: Stop AFFS from using iget() and read_inode() David Howells
2007-10-01 13:09 ` [PATCH 06/30] IGET: Stop autofs " David Howells
2007-10-01 13:09 ` [PATCH 07/30] IGET: Stop BEFS " David Howells
2007-10-01 17:39 ` Zach Brown
2007-10-01 17:44 ` Linus Torvalds
2007-10-01 18:06 ` Christoph Hellwig
2007-10-01 18:18 ` Zach Brown
2007-10-01 18:19 ` Linus Torvalds
2007-10-02 12:32 ` David Howells
2007-10-02 13:02 ` Dave Kleikamp
2007-10-02 13:24 ` David Howells
2007-10-02 14:16 ` Dave Kleikamp
2007-10-01 13:10 ` [PATCH 08/30] IGET: Stop BFS " David Howells
2007-10-01 13:10 ` [PATCH 09/30] IGET: Stop CIFS " David Howells
2007-10-01 13:10 ` [PATCH 10/30] IGET: Stop EFS " David Howells
2007-10-01 13:10 ` [PATCH 11/30] IGET: Stop EXT2 " David Howells
2007-10-02 10:06 ` Jan Kara
2007-10-02 12:58 ` David Howells
2007-10-01 13:10 ` [PATCH 12/30] IGET: Stop EXT3 " David Howells
2007-10-02 10:24 ` Jan Kara
2007-10-02 10:28 ` Jan Kara
2007-10-02 13:16 ` David Howells
2007-10-01 13:10 ` [PATCH 13/30] IGET: Stop EXT4 " David Howells
2007-10-02 12:26 ` Jan Kara
2007-10-02 13:37 ` David Howells
2007-10-01 13:10 ` [PATCH 14/30] IGET: Stop FAT " David Howells
2007-10-01 13:10 ` [PATCH 15/30] IGET: Stop FreeVXFS " David Howells
2007-10-01 13:10 ` [PATCH 16/30] IGET: Stop FUSE " David Howells
2007-10-01 13:10 ` [PATCH 17/30] IGET: Stop HFSPLUS " David Howells
2007-10-01 13:10 ` [PATCH 18/30] IGET: Stop ISOFS from using read_inode() David Howells
2007-10-01 13:10 ` [PATCH 19/30] IGET: Stop JFFS2 from using iget() and read_inode() David Howells
2007-10-01 13:11 ` [PATCH 20/30] IGET: Stop JFS " David Howells
2007-10-01 18:44 ` Dave Kleikamp
2007-10-01 13:11 ` [PATCH 21/30] IGET: Stop the MINIX filesystem " David Howells
2007-10-01 13:11 ` David Howells [this message]
2007-10-01 13:11 ` [PATCH 23/30] IGET: Stop QNX4 " David Howells
2007-10-01 13:11 ` [PATCH 24/30] IGET: Stop ROMFS " David Howells
2007-10-01 13:11 ` [PATCH 25/30] IGET: Stop the SYSV filesystem " David Howells
2007-10-01 13:11 ` [PATCH 26/30] IGET: Stop UFS " David Howells
2007-10-01 13:11 ` [PATCH 27/30] IGET: Stop OPENPROMFS " David Howells
2007-10-01 13:11 ` [PATCH 28/30] IGET: Stop HOSTFS " David Howells
2007-10-01 13:11 ` [PATCH 29/30] IGET: Stop HPPFS " David Howells
2007-10-01 13:11 ` [PATCH 30/30] IGET: Remove iget() and the read_inode() super op as being obsolete David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071001131114.29339.60243.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=akpm@osdl.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).