diff options
| author |   Tao Ma <boyu.mt@taobao.com> | 2011-02-21 11:18:30 +0800 |
|---|---|---|
| committer | Tao Ma <boyu.mt@taobao.com> | 2011-02-21 11:18:30 +0800 |
| commit | 6218b90e7669d83cb8ad744f3400205d260597f2 (patch) | |
| tree | 90f0f5e49ceb0cf2c40b100ec11a11beb25f0f0e /fs/ocfs2 | |
| parent | ocfs2: Remove mlog(0) from fs/ocfs2/file.c (diff) | |
| download | linux-dev-6218b90e7669d83cb8ad744f3400205d260597f2.tar.xz linux-dev-6218b90e7669d83cb8ad744f3400205d260597f2.zip | |
ocfs2: Little refactoring against ocfs2_iget.
ocfs2_iget is used to get/create inode. Only iget5_locked
will give us an inode = NULL. So move this check ahead of
ocfs2_read_locked_inode so that we don't need to check
inode before we read and unlock inode. This is also helpful
for trace event(see the next patch).
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/inode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index a96e56f12728..8ec0cb01cb7c 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -152,16 +152,16 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno, unsigned flags, /* inode was *not* in the inode cache. 2.6.x requires * us to do our own read_inode call and unlock it * afterwards. */ - if (inode && inode->i_state & I_NEW) { - mlog(0, "Inode was not in inode cache, reading it.\n"); - ocfs2_read_locked_inode(inode, &args); - unlock_new_inode(inode); - } if (inode == NULL) { inode = ERR_PTR(-ENOMEM); mlog_errno(PTR_ERR(inode)); goto bail; } + if (inode->i_state & I_NEW) { + mlog(0, "Inode was not in inode cache, reading it.\n"); + ocfs2_read_locked_inode(inode, &args); + unlock_new_inode(inode); + } if (is_bad_inode(inode)) { iput(inode); inode = ERR_PTR(-ESTALE); |