aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_recover.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@sandeen.net>2014-06-22 01:03:54 -0400
committerDave Chinner <david@fromorbit.com>2014-06-22 01:03:54 -0400
commitd99831ff393ff2e28d6110b41f24d9fecf986222 (patch)
tree4e21591c0ed0992ca085b08a2faf7b53fec51586 /fs/xfs/xfs_log_recover.c
parenta497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff)
xfs: return is not a function
return is not a function. "return(EIO);" is silly; "return (EIO);" moreso. return is not a function. Nuke the pointless parens. [dchinner: catch a couple of extra cases in xfs_attr_list.c, xfs_acl.c and xfs_linux.h.] Signed-off-by: Eric Sandeen <sandeen@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
-rw-r--r--fs/xfs/xfs_log_recover.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 981af0f6504b..4c60f118595b 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2946,7 +2946,7 @@ xlog_recover_quotaoff_pass1(
2946 if (qoff_f->qf_flags & XFS_GQUOTA_ACCT) 2946 if (qoff_f->qf_flags & XFS_GQUOTA_ACCT)
2947 log->l_quotaoffs_flag |= XFS_DQ_GROUP; 2947 log->l_quotaoffs_flag |= XFS_DQ_GROUP;
2948 2948
2949 return (0); 2949 return 0;
2950} 2950}
2951 2951
2952/* 2952/*
@@ -2971,7 +2971,7 @@ xlog_recover_dquot_pass2(
2971 * Filesystems are required to send in quota flags at mount time. 2971 * Filesystems are required to send in quota flags at mount time.
2972 */ 2972 */
2973 if (mp->m_qflags == 0) 2973 if (mp->m_qflags == 0)
2974 return (0); 2974 return 0;
2975 2975
2976 recddq = item->ri_buf[1].i_addr; 2976 recddq = item->ri_buf[1].i_addr;
2977 if (recddq == NULL) { 2977 if (recddq == NULL) {
@@ -2990,7 +2990,7 @@ xlog_recover_dquot_pass2(
2990 type = recddq->d_flags & (XFS_DQ_USER | XFS_DQ_PROJ | XFS_DQ_GROUP); 2990 type = recddq->d_flags & (XFS_DQ_USER | XFS_DQ_PROJ | XFS_DQ_GROUP);
2991 ASSERT(type); 2991 ASSERT(type);
2992 if (log->l_quotaoffs_flag & type) 2992 if (log->l_quotaoffs_flag & type)
2993 return (0); 2993 return 0;
2994 2994
2995 /* 2995 /*
2996 * At this point we know that quota was _not_ turned off. 2996 * At this point we know that quota was _not_ turned off.
@@ -3560,7 +3560,7 @@ xlog_recover_process_data(
3560 3560
3561 /* check the log format matches our own - else we can't recover */ 3561 /* check the log format matches our own - else we can't recover */
3562 if (xlog_header_check_recover(log->l_mp, rhead)) 3562 if (xlog_header_check_recover(log->l_mp, rhead))
3563 return (XFS_ERROR(EIO)); 3563 return XFS_ERROR(EIO);
3564 3564
3565 while ((dp < lp) && num_logops) { 3565 while ((dp < lp) && num_logops) {
3566 ASSERT(dp + sizeof(xlog_op_header_t) <= lp); 3566 ASSERT(dp + sizeof(xlog_op_header_t) <= lp);
@@ -3571,7 +3571,7 @@ xlog_recover_process_data(
3571 xfs_warn(log->l_mp, "%s: bad clientid 0x%x", 3571 xfs_warn(log->l_mp, "%s: bad clientid 0x%x",
3572 __func__, ohead->oh_clientid); 3572 __func__, ohead->oh_clientid);
3573 ASSERT(0); 3573 ASSERT(0);
3574 return (XFS_ERROR(EIO)); 3574 return XFS_ERROR(EIO);
3575 } 3575 }
3576 tid = be32_to_cpu(ohead->oh_tid); 3576 tid = be32_to_cpu(ohead->oh_tid);
3577 hash = XLOG_RHASH(tid); 3577 hash = XLOG_RHASH(tid);
@@ -3585,7 +3585,7 @@ xlog_recover_process_data(
3585 xfs_warn(log->l_mp, "%s: bad length 0x%x", 3585 xfs_warn(log->l_mp, "%s: bad length 0x%x",
3586 __func__, be32_to_cpu(ohead->oh_len)); 3586 __func__, be32_to_cpu(ohead->oh_len));
3587 WARN_ON(1); 3587 WARN_ON(1);
3588 return (XFS_ERROR(EIO)); 3588 return XFS_ERROR(EIO);
3589 } 3589 }
3590 flags = ohead->oh_flags & ~XLOG_END_TRANS; 3590 flags = ohead->oh_flags & ~XLOG_END_TRANS;
3591 if (flags & XLOG_WAS_CONT_TRANS) 3591 if (flags & XLOG_WAS_CONT_TRANS)
@@ -4388,7 +4388,7 @@ xlog_do_recover(
4388 * If IO errors happened during recovery, bail out. 4388 * If IO errors happened during recovery, bail out.
4389 */ 4389 */
4390 if (XFS_FORCED_SHUTDOWN(log->l_mp)) { 4390 if (XFS_FORCED_SHUTDOWN(log->l_mp)) {
4391 return (EIO); 4391 return EIO;
4392 } 4392 }
4393 4393
4394 /* 4394 /*