diff options
author | David Howells <dhowells@redhat.com> | 2008-02-07 03:15:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:28 -0500 |
commit | 635253915b3297435e178371407d568522aae3d4 (patch) | |
tree | 98e102b111d0aa8703c8b971cb130acf19ce34d0 /fs/hfsplus/dir.c | |
parent | fa300b1914f892196acb385677047bc978466de7 (diff) |
iget: stop HFSPLUS from using iget() and read_inode()
Stop the HFSPLUS filesystem from using iget() and read_inode(). Replace
hfsplus_read_inode() with hfsplus_iget(), and call that instead of iget().
hfsplus_iget() then uses iget_locked() directly and returns a proper error
code instead of an inode in the event of an error.
hfsplus_fill_super() returns any error incurred when getting the root inode.
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.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/hfsplus/dir.c')
-rw-r--r-- | fs/hfsplus/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 1955ee61251c..29683645fa0a 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c | |||
@@ -97,9 +97,9 @@ again: | |||
97 | goto fail; | 97 | goto fail; |
98 | } | 98 | } |
99 | hfs_find_exit(&fd); | 99 | hfs_find_exit(&fd); |
100 | inode = iget(dir->i_sb, cnid); | 100 | inode = hfsplus_iget(dir->i_sb, cnid); |
101 | if (!inode) | 101 | if (IS_ERR(inode)) |
102 | return ERR_PTR(-EACCES); | 102 | return ERR_CAST(inode); |
103 | if (S_ISREG(inode->i_mode)) | 103 | if (S_ISREG(inode->i_mode)) |
104 | HFSPLUS_I(inode).dev = linkid; | 104 | HFSPLUS_I(inode).dev = linkid; |
105 | out: | 105 | out: |