diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 11:33:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 11:33:40 -0800 |
| commit | 2596627c5c30b45aa206b7b1b864bf00de3c3503 (patch) | |
| tree | 28efd5977acccb330afd886c440430e22b8916ae /fs/ocfs2/export.c | |
| parent | 19e805cb040a81dcfbcf2aa8dbe5d9454c5faf2d (diff) | |
| parent | 50af94b14c98f5769860a282a397c6f3b135c8a8 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Add backup superblock info to ocfs2_fs.h
ocfs2: cleanup ocfs2_iget() errors
ocfs2: Directory c/mtime update fixes
ocfs2: Don't print errors when following symlinks
Diffstat (limited to 'fs/ocfs2/export.c')
| -rw-r--r-- | fs/ocfs2/export.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c index 06be6e774cf..56e1fefc120 100644 --- a/fs/ocfs2/export.c +++ b/fs/ocfs2/export.c @@ -60,14 +60,11 @@ static struct dentry *ocfs2_get_dentry(struct super_block *sb, void *vobjp) inode = ocfs2_iget(OCFS2_SB(sb), handle->ih_blkno, 0); - if (IS_ERR(inode)) { - mlog_errno(PTR_ERR(inode)); + if (IS_ERR(inode)) return (void *)inode; - } if (handle->ih_generation != inode->i_generation) { iput(inode); - mlog_errno(-ESTALE); return ERR_PTR(-ESTALE); } |