diff options
author | Christoph Hellwig <hch@lst.de> | 2008-12-03 06:20:34 -0500 |
---|---|---|
committer | Niv Sardi <xaiki@sgi.com> | 2008-12-03 23:39:23 -0500 |
commit | b56757becf8bc62292263a24a23cf55edb4be55f (patch) | |
tree | 05940d51ed3819d59fdc78d8241128e7c27d1607 /fs/xfs/xfs_mount.c | |
parent | e88f11abe09d14718b82a991db118c5e485aa897 (diff) |
remove leftovers of shared read-only support
We never supported shared read-only filesystems, so remove the dead
code left over from IRIX for it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r-- | fs/xfs/xfs_mount.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 3f999b1c0385..1672ff56a009 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -1352,24 +1352,6 @@ xfs_log_sbcount( | |||
1352 | return error; | 1352 | return error; |
1353 | } | 1353 | } |
1354 | 1354 | ||
1355 | STATIC void | ||
1356 | xfs_mark_shared_ro( | ||
1357 | xfs_mount_t *mp, | ||
1358 | xfs_buf_t *bp) | ||
1359 | { | ||
1360 | xfs_dsb_t *sb = XFS_BUF_TO_SBP(bp); | ||
1361 | __uint16_t version; | ||
1362 | |||
1363 | if (!(sb->sb_flags & XFS_SBF_READONLY)) | ||
1364 | sb->sb_flags |= XFS_SBF_READONLY; | ||
1365 | |||
1366 | version = be16_to_cpu(sb->sb_versionnum); | ||
1367 | if ((version & XFS_SB_VERSION_NUMBITS) != XFS_SB_VERSION_4 || | ||
1368 | !(version & XFS_SB_VERSION_SHAREDBIT)) | ||
1369 | version |= XFS_SB_VERSION_SHAREDBIT; | ||
1370 | sb->sb_versionnum = cpu_to_be16(version); | ||
1371 | } | ||
1372 | |||
1373 | int | 1355 | int |
1374 | xfs_unmountfs_writesb(xfs_mount_t *mp) | 1356 | xfs_unmountfs_writesb(xfs_mount_t *mp) |
1375 | { | 1357 | { |
@@ -1385,12 +1367,6 @@ xfs_unmountfs_writesb(xfs_mount_t *mp) | |||
1385 | 1367 | ||
1386 | sbp = xfs_getsb(mp, 0); | 1368 | sbp = xfs_getsb(mp, 0); |
1387 | 1369 | ||
1388 | /* | ||
1389 | * mark shared-readonly if desired | ||
1390 | */ | ||
1391 | if (mp->m_mk_sharedro) | ||
1392 | xfs_mark_shared_ro(mp, sbp); | ||
1393 | |||
1394 | XFS_BUF_UNDONE(sbp); | 1370 | XFS_BUF_UNDONE(sbp); |
1395 | XFS_BUF_UNREAD(sbp); | 1371 | XFS_BUF_UNREAD(sbp); |
1396 | XFS_BUF_UNDELAYWRITE(sbp); | 1372 | XFS_BUF_UNDELAYWRITE(sbp); |
@@ -1402,8 +1378,6 @@ xfs_unmountfs_writesb(xfs_mount_t *mp) | |||
1402 | if (error) | 1378 | if (error) |
1403 | xfs_ioerror_alert("xfs_unmountfs_writesb", | 1379 | xfs_ioerror_alert("xfs_unmountfs_writesb", |
1404 | mp, sbp, XFS_BUF_ADDR(sbp)); | 1380 | mp, sbp, XFS_BUF_ADDR(sbp)); |
1405 | if (error && mp->m_mk_sharedro) | ||
1406 | xfs_fs_cmn_err(CE_ALERT, mp, "Superblock write error detected while unmounting. Filesystem may not be marked shared readonly"); | ||
1407 | xfs_buf_relse(sbp); | 1381 | xfs_buf_relse(sbp); |
1408 | } | 1382 | } |
1409 | return error; | 1383 | return error; |