On Fri, Jan 04, 2008 at 10:47:55AM +0000, Al Viro wrote:
> On Thu, Jan 03, 2008 at 03:15:56PM +0100, Jiri Slaby wrote:
>
> > Can't say, the DVD seems to be OK, I don't know what was wrong (as I can
> > say,
> > this happened several times in the past yet and after reboot everything OK;
> > I
> > suspect gnome auto mounter -- multiple machines, several DVD ROMs, same disk
> > with OS, similar errors, but that's too few to report).
>
> It is -mm-specific, all right - fallout from
> iget-stop-isofs-from-using-read_inode.patch
> not covered in
> iget-stop-isofs-from-using-read_inode-fix*
>
> Callers in fs/isofs/namei.c are missed.
Yes, some isofs_iget return value should be handled, it is missed.
Maybe this:
Signed-off-by: Dave Young <[EMAIL PROTECTED]>
---
fs/isofs/export.c | 8 ++++----
fs/isofs/namei.c | 4 ++--
fs/isofs/rock.c | 4 +++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff -upr linux/fs/isofs/export.c linux.new/fs/isofs/export.c
--- linux/fs/isofs/export.c 2008-01-04 18:54:40.000000000 +0800
+++ linux.new/fs/isofs/export.c 2008-01-04 19:04:31.000000000 +0800
@@ -26,8 +26,8 @@ isofs_export_iget(struct super_block *sb
if (block == 0)
return ERR_PTR(-ESTALE);
inode = isofs_iget(sb, block, offset);
- if (inode == NULL)
- return ERR_PTR(-ENOMEM);
+ if (IS_ERR(inode))
+ return inode;
if (is_bad_inode(inode)
|| (generation && inode->i_generation != generation))
{
@@ -110,8 +110,8 @@ static struct dentry *isofs_export_get_p
parent_inode = isofs_iget(child_inode->i_sb,
parent_block,
parent_offset);
- if (parent_inode == NULL) {
- rv = ERR_PTR(-EACCES);
+ if (IS_ERR(parent_inode)) {
+ rv = parent_inode;
goto out;
}
diff -upr linux/fs/isofs/namei.c linux.new/fs/isofs/namei.c
--- linux/fs/isofs/namei.c 2008-01-04 18:54:40.000000000 +0800
+++ linux.new/fs/isofs/namei.c 2008-01-04 18:57:27.000000000 +0800
@@ -179,9 +179,9 @@ struct dentry *isofs_lookup(struct inode
inode = NULL;
if (found) {
inode = isofs_iget(dir->i_sb, block, offset);
- if (!inode) {
+ if (IS_ERR(inode)) {
unlock_kernel();
- return ERR_PTR(-EACCES);
+ return inode;
}
}
unlock_kernel();
diff -upr linux/fs/isofs/rock.c linux.new/fs/isofs/rock.c
--- linux/fs/isofs/rock.c 2008-01-04 18:54:40.000000000 +0800
+++ linux.new/fs/isofs/rock.c 2008-01-04 19:01:10.000000000 +0800
@@ -474,8 +474,10 @@ repeat:
isofs_iget(inode->i_sb,
ISOFS_I(inode)->i_first_extent,
0);
- if (!reloc)
+ if (IS_ERR(reloc)) {
+ err = PTR_ERR(reloc);
goto out;
+ }
inode->i_mode = reloc->i_mode;
inode->i_nlink = reloc->i_nlink;
inode->i_uid = reloc->i_uid;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
