diff --git a/[refs] b/[refs] index 632e72b8e74b..d59f4ddc5435 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43f5d210a02dcf9d8bafb147044f27add10a459a +refs/heads/master: bdd512aeeab860f7a9a537142dd0983f884d723a diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h index 034a855a14bb..90e0624d8065 100644 --- a/trunk/fs/gfs2/incore.h +++ b/trunk/fs/gfs2/incore.h @@ -234,7 +234,6 @@ struct gfs2_alloc { }; enum { - GIF_MIN_INIT = 0, GIF_QD_LOCKED = 1, GIF_PAGED = 2, GIF_SW_PAGED = 3, diff --git a/trunk/fs/gfs2/inode.c b/trunk/fs/gfs2/inode.c index c19feb9697b0..6499c4f91078 100644 --- a/trunk/fs/gfs2/inode.c +++ b/trunk/fs/gfs2/inode.c @@ -236,7 +236,6 @@ int gfs2_inode_refresh(struct gfs2_inode *ip) } gfs2_dinode_in(&ip->i_di, dibh->b_data); - set_bit(GIF_MIN_INIT, &ip->i_flags); brelse(dibh);