In gfs2_inode_lookup, we initialize inode->i_atime to the lowest
possibly value after gfs2_inode_refresh may already have been called.
This should be the other way around, but we didn't notice because
usually the inode type is known from the directory entry and so
gfs2_inode_lookup won't call gfs2_inode_refresh.

In addition, only initialize ip->i_no_formal_ino from no_formal_ino when
actually needed.

Signed-off-by: Andreas Gruenbacher <agrue...@redhat.com>
---
 fs/gfs2/inode.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index dafef10b91f1..2716d56ed0a0 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -136,7 +136,6 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, 
unsigned int type,
 
        if (inode->i_state & I_NEW) {
                struct gfs2_sbd *sdp = GFS2_SB(inode);
-               ip->i_no_formal_ino = no_formal_ino;
 
                error = gfs2_glock_get(sdp, no_addr, &gfs2_inode_glops, CREATE, 
&ip->i_gl);
                if (unlikely(error))
@@ -175,21 +174,22 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, 
unsigned int type,
                gfs2_glock_put(io_gl);
                io_gl = NULL;
 
+               /* Lowest possible timestamp; will be overwritten in 
gfs2_dinode_in. */
+               inode->i_atime.tv_sec = 1LL << (8 * 
sizeof(inode->i_atime.tv_sec) - 1);
+               inode->i_atime.tv_nsec = 0;
+
                if (type == DT_UNKNOWN) {
                        /* Inode glock must be locked already */
                        error = gfs2_inode_refresh(GFS2_I(inode));
                        if (error)
                                goto fail_refresh;
                } else {
+                       ip->i_no_formal_ino = no_formal_ino;
                        inode->i_mode = DT2IF(type);
                }
 
                gfs2_set_iop(inode);
 
-               /* Lowest possible timestamp; will be overwritten in 
gfs2_dinode_in. */
-               inode->i_atime.tv_sec = 1LL << (8 * 
sizeof(inode->i_atime.tv_sec) - 1);
-               inode->i_atime.tv_nsec = 0;
-
                unlock_new_inode(inode);
        }
 
-- 
2.20.1

Reply via email to