fs/: Spelling fixes

[linux-2.6-omap-h63xx.git] / fs / xfs / xfs_log.c

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 4f4d20b2721c323fc349ce8219344597f60ee064..77c12715a7d06f00be9f67932930b22aed6eb6cc 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -252,6 +252,29 @@ xlog_grant_add_space(struct log *log, int bytes)
        xlog_grant_add_space_reserve(log, bytes);
 }
 
+static void
+xlog_tic_reset_res(xlog_ticket_t *tic)
+{
+       tic->t_res_num = 0;
+       tic->t_res_arr_sum = 0;
+       tic->t_res_num_ophdrs = 0;
+}
+
+static void
+xlog_tic_add_region(xlog_ticket_t *tic, uint len, uint type)
+{
+       if (tic->t_res_num == XLOG_TIC_LEN_MAX) {
+               /* add to overflow and start again */
+               tic->t_res_o_flow += tic->t_res_arr_sum;
+               tic->t_res_num = 0;
+               tic->t_res_arr_sum = 0;
+       }
+
+       tic->t_res_arr[tic->t_res_num].r_len = len;
+       tic->t_res_arr[tic->t_res_num].r_type = type;
+       tic->t_res_arr_sum += len;
+       tic->t_res_num++;
+}
 
 /*
  * NOTES:
@@ -486,7 +509,7 @@ xfs_log_mount(xfs_mount_t   *mp,
                cmn_err(CE_NOTE,
                        "!Mounting filesystem \"%s\" in no-recovery mode.  Filesystem will be inconsistent.",
                        mp->m_fsname);
-               ASSERT(XFS_MTOVFS(mp)->vfs_flag & VFS_RDONLY);
+               ASSERT(mp->m_flags & XFS_MOUNT_RDONLY);
        }
 
        mp->m_log = xlog_alloc_log(mp, log_target, blk_offset, num_bblks);
@@ -496,16 +519,15 @@ xfs_log_mount(xfs_mount_t *mp,
         * just worked.
         */
        if (!(mp->m_flags & XFS_MOUNT_NORECOVERY)) {
-               bhv_vfs_t       *vfsp = XFS_MTOVFS(mp);
-               int             error, readonly = (vfsp->vfs_flag & VFS_RDONLY);
+               int             error, readonly = (mp->m_flags & XFS_MOUNT_RDONLY);
 
                if (readonly)
-                       vfsp->vfs_flag &= ~VFS_RDONLY;
+                       mp->m_flags &= ~XFS_MOUNT_RDONLY;
 
                error = xlog_recover(mp->m_log);
 
                if (readonly)
-                       vfsp->vfs_flag |= VFS_RDONLY;
+                       mp->m_flags |= XFS_MOUNT_RDONLY;
                if (error) {
                        cmn_err(CE_WARN, "XFS: log mount/recovery failed: error %d", error);
                        xlog_dealloc_log(mp->m_log);
@@ -537,7 +559,7 @@ xfs_log_mount_finish(xfs_mount_t *mp, int mfsi_flags)
                error = xlog_recover_finish(mp->m_log, mfsi_flags);
        else {
                error = 0;
-               ASSERT(XFS_MTOVFS(mp)->vfs_flag & VFS_RDONLY);
+               ASSERT(mp->m_flags & XFS_MOUNT_RDONLY);
        }
 
        return error;
@@ -597,7 +619,7 @@ xfs_log_unmount_write(xfs_mount_t *mp)
         * Don't write out unmount record on read-only mounts.
         * Or, if we are doing a forced umount (typically because of IO errors).
         */
-       if (XFS_MTOVFS(mp)->vfs_flag & VFS_RDONLY)
+       if (mp->m_flags & XFS_MOUNT_RDONLY)
                return 0;
 
        xfs_log_force(mp, 0, XFS_LOG_FORCE|XFS_LOG_SYNC);
@@ -1765,14 +1787,14 @@ xlog_write(xfs_mount_t *        mp,
     len = 0;
     if (ticket->t_flags & XLOG_TIC_INITED) {    /* acct for start rec of xact */
        len += sizeof(xlog_op_header_t);
-       XLOG_TIC_ADD_OPHDR(ticket);
+       ticket->t_res_num_ophdrs++;
     }
 
     for (index = 0; index < nentries; index++) {
        len += sizeof(xlog_op_header_t);            /* each region gets >= 1 */
-       XLOG_TIC_ADD_OPHDR(ticket);
+       ticket->t_res_num_ophdrs++;
        len += reg[index].i_len;
-       XLOG_TIC_ADD_REGION(ticket, reg[index].i_len, reg[index].i_type);
+       xlog_tic_add_region(ticket, reg[index].i_len, reg[index].i_type);
     }
     contwr = *start_lsn = 0;
 
@@ -1881,7 +1903,7 @@ xlog_write(xfs_mount_t *  mp,
                len += sizeof(xlog_op_header_t); /* from splitting of region */
                /* account for new log op header */
                ticket->t_curr_res -= sizeof(xlog_op_header_t);
-               XLOG_TIC_ADD_OPHDR(ticket);
+               ticket->t_res_num_ophdrs++;
            }
            xlog_verify_dest_ptr(log, ptr);
 
@@ -2379,7 +2401,7 @@ restart:
         */
        if (log_offset == 0) {
                ticket->t_curr_res -= log->l_iclog_hsize;
-               XLOG_TIC_ADD_REGION(ticket,
+               xlog_tic_add_region(ticket,
                                    log->l_iclog_hsize,
                                    XLOG_REG_TYPE_LRHEADER);
                INT_SET(head->h_cycle, ARCH_CONVERT, log->l_curr_cycle);
@@ -2567,7 +2589,7 @@ xlog_regrant_write_log_space(xlog_t          *log,
 #endif
 
        tic->t_curr_res = tic->t_unit_res;
-       XLOG_TIC_RESET_RES(tic);
+       xlog_tic_reset_res(tic);
 
        if (tic->t_cnt > 0)
                return 0;
@@ -2708,7 +2730,7 @@ xlog_regrant_reserve_log_space(xlog_t          *log,
        s = GRANT_LOCK(log);
        xlog_grant_sub_space(log, ticket->t_curr_res);
        ticket->t_curr_res = ticket->t_unit_res;
-       XLOG_TIC_RESET_RES(ticket);
+       xlog_tic_reset_res(ticket);
        xlog_trace_loggrant(log, ticket,
                            "xlog_regrant_reserve_log_space: sub current res");
        xlog_verify_grant_head(log, 1);
@@ -2725,7 +2747,7 @@ xlog_regrant_reserve_log_space(xlog_t          *log,
        xlog_verify_grant_head(log, 0);
        GRANT_UNLOCK(log, s);
        ticket->t_curr_res = ticket->t_unit_res;
-       XLOG_TIC_RESET_RES(ticket);
+       xlog_tic_reset_res(ticket);
 }      /* xlog_regrant_reserve_log_space */
 
 
@@ -3348,7 +3370,7 @@ xlog_ticket_get(xlog_t            *log,
                tic->t_flags |= XLOG_TIC_PERM_RESERV;
        sv_init(&(tic->t_sema), SV_DEFAULT, "logtick");
 
-       XLOG_TIC_RESET_RES(tic);
+       xlog_tic_reset_res(tic);
 
        return tic;
 }      /* xlog_ticket_get */