aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_mount.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r--fs/xfs/xfs_mount.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index d3d38836f87f..2953d46be249 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -613,7 +613,7 @@ xfs_mount_reset_sbqflags(
613 return error; 613 return error;
614 } 614 }
615 615
616 xfs_mod_sb(tp, XFS_SB_QFLAGS); 616 xfs_mod_sb(tp);
617 return xfs_trans_commit(tp, 0); 617 return xfs_trans_commit(tp, 0);
618} 618}
619 619
@@ -896,7 +896,7 @@ xfs_mountfs(
896 * perform the update e.g. for the root filesystem. 896 * perform the update e.g. for the root filesystem.
897 */ 897 */
898 if (mp->m_update_flags && !(mp->m_flags & XFS_MOUNT_RDONLY)) { 898 if (mp->m_update_flags && !(mp->m_flags & XFS_MOUNT_RDONLY)) {
899 error = xfs_mount_log_sb(mp, mp->m_update_flags); 899 error = xfs_mount_log_sb(mp);
900 if (error) { 900 if (error) {
901 xfs_warn(mp, "failed to write sb changes"); 901 xfs_warn(mp, "failed to write sb changes");
902 goto out_rtunmount; 902 goto out_rtunmount;
@@ -1126,7 +1126,7 @@ xfs_log_sbcount(xfs_mount_t *mp)
1126 return error; 1126 return error;
1127 } 1127 }
1128 1128
1129 xfs_mod_sb(tp, XFS_SB_IFREE | XFS_SB_ICOUNT | XFS_SB_FDBLOCKS); 1129 xfs_mod_sb(tp);
1130 xfs_trans_set_sync(tp); 1130 xfs_trans_set_sync(tp);
1131 error = xfs_trans_commit(tp, 0); 1131 error = xfs_trans_commit(tp, 0);
1132 return error; 1132 return error;
@@ -1429,15 +1429,10 @@ xfs_freesb(
1429 */ 1429 */
1430int 1430int
1431xfs_mount_log_sb( 1431xfs_mount_log_sb(
1432 xfs_mount_t *mp, 1432 struct xfs_mount *mp)
1433 __int64_t fields)
1434{ 1433{
1435 xfs_trans_t *tp; 1434 struct xfs_trans *tp;
1436 int error; 1435 int error;
1437
1438 ASSERT(fields & (XFS_SB_UNIT | XFS_SB_WIDTH | XFS_SB_UUID |
1439 XFS_SB_FEATURES2 | XFS_SB_BAD_FEATURES2 |
1440 XFS_SB_VERSIONNUM));
1441 1436
1442 tp = xfs_trans_alloc(mp, XFS_TRANS_SB_UNIT); 1437 tp = xfs_trans_alloc(mp, XFS_TRANS_SB_UNIT);
1443 error = xfs_trans_reserve(tp, &M_RES(mp)->tr_sb, 0, 0); 1438 error = xfs_trans_reserve(tp, &M_RES(mp)->tr_sb, 0, 0);
@@ -1445,9 +1440,8 @@ xfs_mount_log_sb(
1445 xfs_trans_cancel(tp, 0); 1440 xfs_trans_cancel(tp, 0);
1446 return error; 1441 return error;
1447 } 1442 }
1448 xfs_mod_sb(tp, fields); 1443 xfs_mod_sb(tp);
1449 error = xfs_trans_commit(tp, 0); 1444 return xfs_trans_commit(tp, 0);
1450 return error;
1451} 1445}
1452 1446
1453/* 1447/*