diff options
author | Dave Chinner <david@fromorbit.com> | 2015-01-22 01:20:53 +0300 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-01-22 01:20:53 +0300 |
commit | 465e2def7cb45864da1f82afb973a6acd1046ed8 (patch) | |
tree | d085a45f4575a8ea31d128626c4f1f650cf9d54a /fs/xfs/libxfs/xfs_attr_leaf.c | |
parent | 6bcf0939ff12464c7ea24c056826b8a26def9b06 (diff) | |
parent | 074e427ba7f7398427e4f8e2aec071edcc509673 (diff) | |
download | linux-465e2def7cb45864da1f82afb973a6acd1046ed8.tar.xz |
Merge branch 'xfs-sb-logging-rework' into for-next
Conflicts:
fs/xfs/xfs_mount.c
Diffstat (limited to 'fs/xfs/libxfs/xfs_attr_leaf.c')
-rw-r--r-- | fs/xfs/libxfs/xfs_attr_leaf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 5d38e8b8a913..15105dbc9e28 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -403,7 +403,7 @@ xfs_sbversion_add_attr2(xfs_mount_t *mp, xfs_trans_t *tp) if (!xfs_sb_version_hasattr2(&mp->m_sb)) { xfs_sb_version_addattr2(&mp->m_sb); spin_unlock(&mp->m_sb_lock); - xfs_mod_sb(tp, XFS_SB_VERSIONNUM | XFS_SB_FEATURES2); + xfs_log_sb(tp); } else spin_unlock(&mp->m_sb_lock); } |