Diff for /xfs-linux/xfs_mount.c between versions 1.389 and 1.390

version 1.389, 2006/12/11 14:47:25 version 1.390, 2007/01/10 14:42:05
Line 52  STATIC void xfs_unmountfs_wait(xfs_mount Line 52  STATIC void xfs_unmountfs_wait(xfs_mount
   
 #ifdef HAVE_PERCPU_SB  #ifdef HAVE_PERCPU_SB
 STATIC void     xfs_icsb_destroy_counters(xfs_mount_t *);  STATIC void     xfs_icsb_destroy_counters(xfs_mount_t *);
 STATIC void     xfs_icsb_balance_counter(xfs_mount_t *, xfs_sb_field_t, int,  STATIC void     xfs_icsb_balance_counter(xfs_mount_t *, xfs_sb_field_t,
 int);                                                  int, int);
 STATIC void     xfs_icsb_sync_counters(xfs_mount_t *);  STATIC void     xfs_icsb_sync_counters(xfs_mount_t *);
 STATIC int      xfs_icsb_modify_counters(xfs_mount_t *, xfs_sb_field_t,  STATIC int      xfs_icsb_modify_counters(xfs_mount_t *, xfs_sb_field_t,
                                                 int, int);                                                  int64_t, int);
 STATIC int      xfs_icsb_disable_counter(xfs_mount_t *, xfs_sb_field_t);  STATIC int      xfs_icsb_disable_counter(xfs_mount_t *, xfs_sb_field_t);
   
 #else  #else
Line 1254  xfs_mod_sb(xfs_trans_t *tp, __int64_t fi Line 1254  xfs_mod_sb(xfs_trans_t *tp, __int64_t fi
  * The SB_LOCK must be held when this routine is called.   * The SB_LOCK must be held when this routine is called.
  */   */
 int  int
 xfs_mod_incore_sb_unlocked(xfs_mount_t *mp, xfs_sb_field_t field,  xfs_mod_incore_sb_unlocked(
                         int delta, int rsvd)          xfs_mount_t     *mp,
           xfs_sb_field_t  field,
           int64_t         delta,
           int             rsvd)
 {  {
         int             scounter;       /* short counter for 32 bit fields */          int             scounter;       /* short counter for 32 bit fields */
         long long       lcounter;       /* long counter for 64 bit fields */          long long       lcounter;       /* long counter for 64 bit fields */
Line 1287  xfs_mod_incore_sb_unlocked(xfs_mount_t * Line 1290  xfs_mod_incore_sb_unlocked(xfs_mount_t *
                 mp->m_sb.sb_ifree = lcounter;                  mp->m_sb.sb_ifree = lcounter;
                 return 0;                  return 0;
         case XFS_SBS_FDBLOCKS:          case XFS_SBS_FDBLOCKS:
   
                 lcounter = (long long)                  lcounter = (long long)
                         mp->m_sb.sb_fdblocks - XFS_ALLOC_SET_ASIDE(mp);                          mp->m_sb.sb_fdblocks - XFS_ALLOC_SET_ASIDE(mp);
                 res_used = (long long)(mp->m_resblks - mp->m_resblks_avail);                  res_used = (long long)(mp->m_resblks - mp->m_resblks_avail);
Line 1418  xfs_mod_incore_sb_unlocked(xfs_mount_t * Line 1420  xfs_mod_incore_sb_unlocked(xfs_mount_t *
  * routine to do the work.   * routine to do the work.
  */   */
 int  int
 xfs_mod_incore_sb(xfs_mount_t *mp, xfs_sb_field_t field, int delta, int rsvd)  xfs_mod_incore_sb(
           xfs_mount_t     *mp,
           xfs_sb_field_t  field,
           int64_t         delta,
           int             rsvd)
 {  {
         unsigned long   s;          unsigned long   s;
         int     status;          int     status;
Line 2092  int Line 2098  int
 xfs_icsb_modify_counters(  xfs_icsb_modify_counters(
         xfs_mount_t     *mp,          xfs_mount_t     *mp,
         xfs_sb_field_t  field,          xfs_sb_field_t  field,
         int             delta,          int64_t         delta,
         int             rsvd)          int             rsvd)
 {  {
         xfs_icsb_cnts_t *icsbp;          xfs_icsb_cnts_t *icsbp;

Removed from v.1.389  
changed lines
  Added in v.1.390


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>