linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: torvalds@osdl.org, akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	dhowells@redhat.com
Subject: [PATCH 30/31] IGET: Stop HPPFS from using iget() and read_inode() [try #4]
Date: Fri, 12 Oct 2007 10:09:41 +0100	[thread overview]
Message-ID: <20071012090941.3442.65883.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20071012090709.3442.69133.stgit@warthog.procyon.org.uk>

Stop the HPPFS filesystem from using iget() and read_inode().  Provide an
hppfs_iget(), and call that instead of iget().  hppfs_iget() then uses
iget_locked() directly and returns a proper error code instead of an inode in
the event of an error.

hppfs_fill_sb_common() returns any error incurred when getting the root inode
instead of EINVAL.

Note that the contents of hppfs_kern.c need to be examined:

 (*) The HPPFS inode retains a pointer to the proc dentry it is shadowing, but
     whilst it does appear to retain a reference to it, it doesn't appear to
     destroy the reference if the inode goes away.

 (*) hppfs_iget() should perhaps subsume init_inode() and hppfs_read_inode().

 (*) It would appear that all hppfs inodes are the same inode because iget()
     was being called with inode number 0, which forms the lookup key.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 fs/hppfs/hppfs_kern.c |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c
index affb741..a1e1f0f 100644
--- a/fs/hppfs/hppfs_kern.c
+++ b/fs/hppfs/hppfs_kern.c
@@ -155,6 +155,20 @@ static void hppfs_read_inode(struct inode *ino)
 	ino->i_blocks = proc_ino->i_blocks;
 }
 
+static struct inode *hppfs_iget(struct super_block *sb)
+{
+	struct inode *inode;
+
+	inode = iget_locked(sb, 0);
+	if (!inode)
+		return ERR_PTR(-ENOMEM);
+	if (inode->i_state & I_NEW) {
+		hppfs_read_inode(inode);
+		unlock_new_inode(inode);
+	}
+	return inode;
+}
+
 static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry,
                                   struct nameidata *nd)
 {
@@ -190,9 +204,11 @@ static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry,
 	if(IS_ERR(proc_dentry))
 		return(proc_dentry);
 
-	inode = iget(ino->i_sb, 0);
-	if(inode == NULL)
+	inode = hppfs_iget(ino->i_sb);
+	if (IS_ERR(inode)) {
+		err = PTR_ERR(inode);
 		goto out_dput;
+	}
 
 	err = init_inode(inode, proc_dentry);
 	if(err)
@@ -652,7 +668,6 @@ static void hppfs_destroy_inode(struct inode *inode)
 static const struct super_operations hppfs_sbops = {
 	.alloc_inode	= hppfs_alloc_inode,
 	.destroy_inode	= hppfs_destroy_inode,
-	.read_inode	= hppfs_read_inode,
 	.delete_inode	= hppfs_delete_inode,
 	.statfs		= hppfs_statfs,
 };
@@ -745,9 +760,11 @@ static int hppfs_fill_super(struct super_block *sb, void *d, int silent)
 	sb->s_magic = HPPFS_SUPER_MAGIC;
 	sb->s_op = &hppfs_sbops;
 
-	root_inode = iget(sb, 0);
-	if(root_inode == NULL)
+	root_inode = hppfs_iget(sb);
+	if (IS_ERR(root_inode)) {
+		err = PTR_ERR(root_inode);
 		goto out;
+	}
 
 	err = init_inode(root_inode, proc_sb->s_root);
 	if(err)


  parent reply	other threads:[~2007-10-12  9:09 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-12  9:07 [PATCH 00/31] Remove iget() and read_inode() [try #4] David Howells
2007-10-11 16:48 ` Nick Piggin
2007-10-12  9:07 ` [PATCH 01/31] Add an ERR_CAST() macro to complement ERR_PTR and co. " David Howells
2007-10-12  9:07 ` [PATCH 02/31] Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p) " David Howells
2007-10-12  9:07 ` [PATCH 03/31] IGET: Introduce a function to register iget failure " David Howells
2007-10-12  9:07 ` [PATCH 04/31] IGET: Use iget_failed() in AFS " David Howells
2007-10-12  9:07 ` [PATCH 05/31] IGET: Use iget_failed() in GFS2 " David Howells
2007-10-12  9:07 ` [PATCH 06/31] IGET: Stop AFFS from using iget() and read_inode() " David Howells
2007-10-12  9:07 ` [PATCH 07/31] IGET: Stop autofs " David Howells
2007-10-12  9:07 ` [PATCH 08/31] IGET: Stop BEFS " David Howells
2007-10-12  9:07 ` [PATCH 09/31] IGET: Stop BFS " David Howells
2007-10-12  9:08 ` [PATCH 10/31] IGET: Stop CIFS " David Howells
2007-10-12  9:08 ` [PATCH 11/31] IGET: Stop EFS " David Howells
2007-10-12  9:08 ` [PATCH 12/31] IGET: Stop EXT2 " David Howells
2007-10-12  9:08 ` [PATCH 13/31] IGET: Stop EXT3 " David Howells
2007-10-12  9:08 ` [PATCH 14/31] IGET: Stop EXT4 " David Howells
2007-10-12  9:08 ` [PATCH 15/31] IGET: Stop FAT " David Howells
2007-10-12  9:08 ` [PATCH 16/31] IGET: Stop FreeVXFS " David Howells
2007-10-12  9:08 ` [PATCH 17/31] IGET: Stop FUSE " David Howells
2007-10-12  9:08 ` [PATCH 18/31] IGET: Stop HFSPLUS " David Howells
2007-10-12  9:08 ` [PATCH 19/31] IGET: Stop ISOFS from using " David Howells
2007-10-12  9:08 ` [PATCH 20/31] IGET: Stop JFFS2 from using iget() and " David Howells
2007-10-12  9:08 ` [PATCH 21/31] IGET: Stop JFS " David Howells
2007-10-12  9:09 ` [PATCH 22/31] IGET: Stop the MINIX filesystem " David Howells
2007-10-12  9:09 ` [PATCH 23/31] IGET: Stop PROCFS " David Howells
2007-10-12  9:09 ` [PATCH 24/31] IGET: Stop QNX4 " David Howells
2007-10-12  9:09 ` [PATCH 25/31] IGET: Stop ROMFS " David Howells
2007-10-12  9:09 ` [PATCH 26/31] IGET: Stop the SYSV filesystem " David Howells
2007-10-12  9:09 ` [PATCH 27/31] IGET: Stop UFS " David Howells
2007-10-12  9:09 ` [PATCH 28/31] IGET: Stop OPENPROMFS " David Howells
2007-10-12  9:09 ` [PATCH 29/31] IGET: Stop HOSTFS " David Howells
2007-10-12  9:09 ` David Howells [this message]
2007-10-12  9:09 ` [PATCH 31/31] IGET: Remove iget() and the read_inode() super op as being obsolete " David Howells
2007-10-12 10:58 ` [PATCH 00/31] Remove iget() and read_inode() " 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=20071012090941.3442.65883.stgit@warthog.procyon.org.uk \
    --to=dhowells@redhat.com \
    --cc=akpm@osdl.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /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).