diff options
Diffstat (limited to 'fs/xfs/xfs_mount.c')
| -rw-r--r-- | fs/xfs/xfs_mount.c | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index cfa2fb4e7f97..55de83585e00 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
| @@ -1856,12 +1856,8 @@ xfs_mod_incore_sb( | |||
| 1856 | case XFS_SBS_ICOUNT: | 1856 | case XFS_SBS_ICOUNT: |
| 1857 | case XFS_SBS_IFREE: | 1857 | case XFS_SBS_IFREE: |
| 1858 | case XFS_SBS_FDBLOCKS: | 1858 | case XFS_SBS_FDBLOCKS: |
| 1859 | if (!(mp->m_flags & XFS_MOUNT_NO_PERCPU_SB)) { | 1859 | status = xfs_icsb_modify_counters(mp, field, delta, rsvd); |
| 1860 | status = xfs_icsb_modify_counters(mp, field, | 1860 | break; |
| 1861 | delta, rsvd); | ||
| 1862 | break; | ||
| 1863 | } | ||
| 1864 | /* FALLTHROUGH */ | ||
| 1865 | #endif | 1861 | #endif |
| 1866 | default: | 1862 | default: |
| 1867 | spin_lock(&mp->m_sb_lock); | 1863 | spin_lock(&mp->m_sb_lock); |
| @@ -1910,15 +1906,12 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd) | |||
| 1910 | case XFS_SBS_ICOUNT: | 1906 | case XFS_SBS_ICOUNT: |
| 1911 | case XFS_SBS_IFREE: | 1907 | case XFS_SBS_IFREE: |
| 1912 | case XFS_SBS_FDBLOCKS: | 1908 | case XFS_SBS_FDBLOCKS: |
| 1913 | if (!(mp->m_flags & XFS_MOUNT_NO_PERCPU_SB)) { | 1909 | spin_unlock(&mp->m_sb_lock); |
| 1914 | spin_unlock(&mp->m_sb_lock); | 1910 | status = xfs_icsb_modify_counters(mp, |
| 1915 | status = xfs_icsb_modify_counters(mp, | 1911 | msbp->msb_field, |
| 1916 | msbp->msb_field, | 1912 | msbp->msb_delta, rsvd); |
| 1917 | msbp->msb_delta, rsvd); | 1913 | spin_lock(&mp->m_sb_lock); |
| 1918 | spin_lock(&mp->m_sb_lock); | 1914 | break; |
| 1919 | break; | ||
| 1920 | } | ||
| 1921 | /* FALLTHROUGH */ | ||
| 1922 | #endif | 1915 | #endif |
| 1923 | default: | 1916 | default: |
| 1924 | status = xfs_mod_incore_sb_unlocked(mp, | 1917 | status = xfs_mod_incore_sb_unlocked(mp, |
| @@ -1948,16 +1941,13 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd) | |||
| 1948 | case XFS_SBS_ICOUNT: | 1941 | case XFS_SBS_ICOUNT: |
| 1949 | case XFS_SBS_IFREE: | 1942 | case XFS_SBS_IFREE: |
| 1950 | case XFS_SBS_FDBLOCKS: | 1943 | case XFS_SBS_FDBLOCKS: |
| 1951 | if (!(mp->m_flags & XFS_MOUNT_NO_PERCPU_SB)) { | 1944 | spin_unlock(&mp->m_sb_lock); |
| 1952 | spin_unlock(&mp->m_sb_lock); | 1945 | status = xfs_icsb_modify_counters(mp, |
| 1953 | status = xfs_icsb_modify_counters(mp, | 1946 | msbp->msb_field, |
| 1954 | msbp->msb_field, | 1947 | -(msbp->msb_delta), |
| 1955 | -(msbp->msb_delta), | 1948 | rsvd); |
| 1956 | rsvd); | 1949 | spin_lock(&mp->m_sb_lock); |
| 1957 | spin_lock(&mp->m_sb_lock); | 1950 | break; |
| 1958 | break; | ||
| 1959 | } | ||
| 1960 | /* FALLTHROUGH */ | ||
| 1961 | #endif | 1951 | #endif |
| 1962 | default: | 1952 | default: |
| 1963 | status = xfs_mod_incore_sb_unlocked(mp, | 1953 | status = xfs_mod_incore_sb_unlocked(mp, |