[BACK]Return to ufs_lookup.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / ufs / ufs

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/ufs/ufs/ufs_lookup.c between version 1.115 and 1.116

version 1.115, 2012/05/09 00:21:18 version 1.116, 2012/06/04 16:46:45
Line 816  ufs_direnter(struct vnode *dvp, const st
Line 816  ufs_direnter(struct vnode *dvp, const st
         dp = VTOI(dvp);          dp = VTOI(dvp);
         newentrysize = DIRSIZ(0, dirp, 0);          newentrysize = DIRSIZ(0, dirp, 0);
   
 #if 0  
         struct ufs_lookup_results *ulr;  
         /* XXX should handle this material another way */  
         ulr = &dp->i_crap;  
         UFS_CHECK_CRAPCOUNTER(dp);  
 #endif  
   
         if (ulr->ulr_count == 0) {          if (ulr->ulr_count == 0) {
                 /*                  /*
                  * If ulr_count is 0, then namei could find no                   * If ulr_count is 0, then namei could find no
Line 873  ufs_direnter(struct vnode *dvp, const st
Line 866  ufs_direnter(struct vnode *dvp, const st
   
         /*          /*
          * If ulr_count is non-zero, then namei found space for the new           * If ulr_count is non-zero, then namei found space for the new
          * entry in the range ulr_offset to url_offset + url_count           * entry in the range ulr_offset to ulr_offset + ulr_count
          * in the directory. To use this space, we may have to compact           * in the directory. To use this space, we may have to compact
          * the entries located there, by copying them together towards the           * the entries located there, by copying them together towards the
          * beginning of the block, leaving the free space in one usable           * beginning of the block, leaving the free space in one usable
Line 907  ufs_direnter(struct vnode *dvp, const st
Line 900  ufs_direnter(struct vnode *dvp, const st
         /*          /*
          * Find space for the new entry. In the simple case, the entry at           * Find space for the new entry. In the simple case, the entry at
          * offset base will have the space. If it does not, then namei           * offset base will have the space. If it does not, then namei
          * arranged that compacting the region dp->i_offset to           * arranged that compacting the region ulr_offset to
          * dp->i_offset + dp->i_count would yield the space.           * ulr_offset + ulr_count would yield the space.
          */           */
         ep = (struct direct *)dirbuf;          ep = (struct direct *)dirbuf;
         dsize = (ep->d_ino != 0) ? DIRSIZ(FSFMT(dvp), ep, needswap) : 0;          dsize = (ep->d_ino != 0) ? DIRSIZ(FSFMT(dvp), ep, needswap) : 0;
Line 1084  ufs_dirremove(struct vnode *dvp, const s
Line 1077  ufs_dirremove(struct vnode *dvp, const s
 #ifdef UFS_DIRHASH  #ifdef UFS_DIRHASH
         /*          /*
          * Remove the dirhash entry. This is complicated by the fact           * Remove the dirhash entry. This is complicated by the fact
          * that `ep' is the previous entry when dp->i_count != 0.           * that `ep' is the previous entry when ulr_count != 0.
          */           */
         if (dp->i_dirhash != NULL)          if (dp->i_dirhash != NULL)
                 ufsdirhash_remove(dp, (ulr->ulr_count == 0) ? ep :                  ufsdirhash_remove(dp, (ulr->ulr_count == 0) ? ep :

Legend:
Removed from v.1.115  
changed lines
  Added in v.1.116

CVSweb <webmaster@jp.NetBSD.org>