From: Jeff Layton <jlayton@redhat.com> Date: Tue, 26 Aug 2008 11:38:35 -0400 Subject: [fs] introduce a function to register iget failure Message-id: 1219765117-21681-5-git-send-email-jlayton@redhat.com O-Subject: [RHEL5.3 PATCH 4/6] BZ#453462: iget: introduce a function to register iget failure Bugzilla: 453462 RH-Acked-by: David Howells <dhowells@redhat.com> From: David Howells <dhowells@redhat.com> Upstream commit b46980feed937868d3333514028bfbe9a651e4ca Introduce a function to register failure in an inode construction path. This includes marking the inode under construction as bad, unlocking it and releasing it. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting index 5531694..fbbecd4 100644 --- a/Documentation/filesystems/porting +++ b/Documentation/filesystems/porting @@ -184,11 +184,19 @@ just takes the superblock and inode number as arguments and does the test and set for you. e.g. - inode = iget_locked(sb, ino); - if (inode->i_state & I_NEW) { - read_inode_from_disk(inode); - unlock_new_inode(inode); - } + inode = iget_locked(sb, ino); + if (inode->i_state & I_NEW) { + err = read_inode_from_disk(inode); + if (err < 0) { + iget_failed(inode); + return err; + } + unlock_new_inode(inode); + } + +Note that if the process of setting up a new inode fails, then iget_failed() +should be called on the inode to render it dead, and an appropriate error +should be passed back to the caller. --- [recommended] diff --git a/fs/bad_inode.c b/fs/bad_inode.c index a139ad0..19218a3 100644 --- a/fs/bad_inode.c +++ b/fs/bad_inode.c @@ -381,3 +381,17 @@ int is_bad_inode(struct inode *inode) } EXPORT_SYMBOL(is_bad_inode); + +/** + * iget_failed - Mark an under-construction inode as dead and release it + * @inode: The inode to discard + * + * Mark an under-construction inode as dead and release it. + */ +void iget_failed(struct inode *inode) +{ + make_bad_inode(inode); + unlock_new_inode(inode); + iput(inode); +} +EXPORT_SYMBOL(iget_failed); diff --git a/include/linux/fs.h b/include/linux/fs.h index c3bbf7c..1bac5e8 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1731,6 +1731,7 @@ static inline struct inode *iget(struct super_block *sb, unsigned long ino) } extern void __iget(struct inode * inode); +extern void iget_failed(struct inode *); extern void clear_inode(struct inode *); extern void destroy_inode(struct inode *); extern struct inode *new_inode(struct super_block *);