This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / xfs / xfs_iget.c

diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index bef9164..07641fc 100644 (file)
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -169,7 +169,6 @@ xfs_iget_core(
        xfs_mount_t     *mp,
        xfs_trans_t     *tp,
        xfs_ino_t       ino,
-       uint            flags,
        uint            lock_flags,
        xfs_inode_t     **ipp,
        xfs_daddr_t     bno)
@@ -181,6 +180,7 @@ xfs_iget_core(
        ulong           version;
        int             error;
        /* REFERENCED */
+       int             newnode;
        xfs_chash_t     *ch;
        xfs_chashlist_t *chl, *chlnew;
        SPLDECL(s);
@@ -193,22 +193,11 @@ again:
 
        for (ip = ih->ih_next; ip != NULL; ip = ip->i_next) {
                if (ip->i_ino == ino) {
-                       /*
-                        * If INEW is set this inode is being set up
-                        * we need to pause and try again.
-                        */
-                       if (ip->i_flags & XFS_INEW) {
-                               read_unlock(&ih->ih_lock);
-                               delay(1);
-                               XFS_STATS_INC(xs_ig_frecycle);
-
-                               goto again;
-                       }
 
                        inode_vp = XFS_ITOV_NULL(ip);
+
                        if (inode_vp == NULL) {
-                               /*
-                                * If IRECLAIM is set this inode is
+                               /* If IRECLAIM is set this inode is
                                 * on its way out of the system,
                                 * we need to pause and try again.
                                 */
@@ -261,15 +250,14 @@ again:
                        XFS_STATS_INC(xs_ig_found);
 
 finish_inode:
-                       if (ip->i_d.di_mode == 0) {
-                               if (!(flags & IGET_CREATE))
-                                       return ENOENT;
-                               xfs_iocore_inode_reinit(ip);
-                       }
-       
-                       if (lock_flags != 0)
+                       if (lock_flags != 0) {
                                xfs_ilock(ip, lock_flags);
+                       }
 
+                       newnode = (ip->i_d.di_mode == 0);
+                       if (newnode) {
+                               xfs_iocore_inode_reinit(ip);
+                       }
                        ip->i_flags &= ~XFS_ISTALE;
 
                        vn_trace_exit(vp, "xfs_iget.found",
@@ -305,11 +293,6 @@ finish_inode:
        if (lock_flags != 0) {
                xfs_ilock(ip, lock_flags);
        }
-               
-       if ((ip->i_d.di_mode == 0) && !(flags & IGET_CREATE)) {
-               xfs_idestroy(ip);
-               return ENOENT;
-       }
 
        /*
         * Put ip on its hash chain, unless someone else hashed a duplicate
@@ -341,7 +324,6 @@ finish_inode:
        ih->ih_next = ip;
        ip->i_udquot = ip->i_gdquot = NULL;
        ih->ih_version++;
-       ip->i_flags |= XFS_INEW;
 
        write_unlock(&ih->ih_lock);
 
@@ -422,6 +404,8 @@ finish_inode:
 
        XFS_MOUNT_IUNLOCK(mp);
 
+       newnode = 1;
+
  return_ip:
        ASSERT(ip->i_df.if_ext_max ==
               XFS_IFORK_DSIZE(ip) / sizeof(xfs_bmbt_rec_t));
@@ -450,7 +434,6 @@ xfs_iget(
        xfs_mount_t     *mp,
        xfs_trans_t     *tp,
        xfs_ino_t       ino,
-       uint            flags,
        uint            lock_flags,
        xfs_inode_t     **ipp,
        xfs_daddr_t     bno)
@@ -471,8 +454,8 @@ retry:
                if (inode->i_state & I_NEW) {
 inode_allocate:
                        vn_initialize(inode);
-                       error = xfs_iget_core(vp, mp, tp, ino, flags,
-                                       lock_flags, ipp, bno);
+                       error = xfs_iget_core(vp, mp, tp, ino,
+                                               lock_flags, ipp, bno);
                        if (error) {
                                vn_mark_bad(vp);
                                if (inode->i_state & I_NEW)
@@ -593,10 +576,6 @@ xfs_iput_new(xfs_inode_t   *ip,
 
        vn_trace_entry(vp, "xfs_iput_new", (inst_t *)__return_address);
 
-       if ((ip->i_d.di_mode == 0)) {
-               ASSERT(!(ip->i_flags & XFS_IRECLAIMABLE));
-               vn_mark_bad(vp);
-       }
        if (inode->i_state & I_NEW)
                unlock_new_inode(inode);
        if (lock_flags)