diff options
author | David Howells <dhowells@redhat.com> | 2008-02-07 03:15:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:27 -0500 |
commit | 1d1fe1ee02b9ac2660995b10e35dd41448fef011 (patch) | |
tree | 8961bbe5a36a07dc8ad8c6cd3e973ce0fcde5850 /fs/ext4/resize.c | |
parent | 473043dcee1874aab99f66b0362b344618eb3790 (diff) |
iget: stop EXT4 from using iget() and read_inode()
Stop the EXT4 filesystem from using iget() and read_inode(). Replace
ext4_read_inode() with ext4_iget(), and call that instead of iget().
ext4_iget() then uses iget_locked() directly and returns a proper error code
instead of an inode in the event of an error.
ext4_fill_super() returns any error incurred when getting the root inode
instead of EINVAL.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: "Theodore Ts'o" <tytso@mit.edu>
Acked-by: Jan Kara <jack@suse.cz>
Cc: <linux-ext4@vger.kernel.org>
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>
Diffstat (limited to 'fs/ext4/resize.c')
-rw-r--r-- | fs/ext4/resize.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 4fbba60816f4..9477a2bd6ff2 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c | |||
@@ -779,12 +779,11 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) | |||
779 | "No reserved GDT blocks, can't resize"); | 779 | "No reserved GDT blocks, can't resize"); |
780 | return -EPERM; | 780 | return -EPERM; |
781 | } | 781 | } |
782 | inode = iget(sb, EXT4_RESIZE_INO); | 782 | inode = ext4_iget(sb, EXT4_RESIZE_INO); |
783 | if (!inode || is_bad_inode(inode)) { | 783 | if (IS_ERR(inode)) { |
784 | ext4_warning(sb, __FUNCTION__, | 784 | ext4_warning(sb, __FUNCTION__, |
785 | "Error opening resize inode"); | 785 | "Error opening resize inode"); |
786 | iput(inode); | 786 | return PTR_ERR(inode); |
787 | return -ENOENT; | ||
788 | } | 787 | } |
789 | } | 788 | } |
790 | 789 | ||