remove leftovers of shared read-only support
PATCH 10/10 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 <[email protected]>
fs/xfs/xfs_mount.c +0 -26
@@ -1353,24 +1353,6 @@ xfs_log_sbcount(return error; } -STATIC void -xfs_mark_shared_ro ( -xfs_mount_t *mp, -xfs_buf_t *bp) -{ -xfs_dsb_t *sb =XFS_BUF_TO_SBP (bp); -__uint16_t version; - -if (!(sb->sb_flags &XFS_SBF_READONLY )) - sb->sb_flags |=XFS_SBF_READONLY ; - - version =be16_to_cpu (sb->sb_versionnum); -if ((version &XFS_SB_VERSION_NUMBITS ) !=XFS_SB_VERSION_4 || - !(version &XFS_SB_VERSION_SHAREDBIT )) - version |=XFS_SB_VERSION_SHAREDBIT ; - sb->sb_versionnum =cpu_to_be16 (version); -} -int xfs_unmountfs_writesb (xfs_mount_t *mp) {
@@ -1386,12 +1368,6 @@ xfs_unmountfs_writesb(xfs_mount_t *mp) sbp =xfs_getsb (mp,0 ); -/* -* mark shared-readonly if desired -*/ -if (mp->m_mk_sharedro) -xfs_mark_shared_ro (mp, sbp); -XFS_BUF_UNDONE (sbp);XFS_BUF_UNREAD (sbp);XFS_BUF_UNDELAYWRITE (sbp);
@@ -1403,8 +1379,6 @@ xfs_unmountfs_writesb(xfs_mount_t *mp)if (error)xfs_ioerror_alert ("xfs_unmountfs_writesb" , mp, sbp,XFS_BUF_ADDR (sbp)); -if (error && mp->m_mk_sharedro) -xfs_fs_cmn_err (CE_ALERT , mp,"Superblock write error detected while unmounting. Filesystem may not be marked shared readonly" );xfs_buf_relse (sbp); }return error;
fs/xfs/xfs_mount.h +0 -1
@@ -302,7 +302,6 @@ typedef struct xfs_mount {int m_sinoalign;/* stripe unit inode alignment */ int m_attr_magicpct;/* 37% of the blocksize */ int m_dir_magicpct;/* 37% of the dir blocksize */ -__uint8_t m_mk_sharedro;/* mark shared ro on unmount */ __uint8_t m_sectbb_log;/* sectlog - BBSHIFT */ const struct xfs_nameops *m_dirnameops;/* vector of dir name ops */ int m_dirblksize;/* directory block sz--bytes */
fs/xfs/xfsidbg.c +1 -2
@@ -6523,8 +6523,7 @@ xfsidbg_xmount(xfs_mount_t *mp)kdb_printf ("dalign %d swidth %d sinoalign %d attr_magicpct %d dir_magicpct %d\n" , mp->m_dalign, mp->m_swidth, mp->m_sinoalign, mp->m_attr_magicpct, mp->m_dir_magicpct); -kdb_printf ("mk_sharedro %d sectbb_log %d\n" , - mp->m_mk_sharedro, mp->m_sectbb_log); +kdb_printf ("sectbb_log %d\n" , mp->m_sectbb_log);kdb_printf ("dirblkfsbs %d\n" , mp->m_dirblkfsbs); kdb_printf("dirblksize %d dirdatablk 0x%Lx dirleafblk 0x%Lx dirfreeblk 0x%Lx\n", mp->m_dirblksize,
fs/xfs/linux-2.6/xfs_super.c +0 -29
@@ -1384,35 +1384,6 @@ xfs_finish_flags(return XFS_ERROR (EROFS ); } -#if 0 /* shared mounts were never supported on Linux */ -/* -* check for shared mount. -*/ -if (ap->flags &XFSMNT_SHARED ) { -if (!xfs_sb_version_hasshared (&mp->m_sb)) -return XFS_ERROR (EINVAL ); - -/* -* For IRIX 6.5, shared mounts must have the shared -* version bit set, have the persistent readonly -* field set, must be version 0 and can only be mounted -* read-only. -*/ -if (!ronly || !(mp->m_sb.sb_flags &XFS_SBF_READONLY ) || - (mp->m_sb.sb_shared_vn !=0 )) -return XFS_ERROR (EINVAL ); - - mp->m_flags |=XFS_MOUNT_SHARED ; - -/* -* Shared XFS V0 can't deal with DMI. Return EINVAL. -*/ -if (mp->m_sb.sb_shared_vn ==0 && - (mp->m_flags &XFS_MOUNT_DMAPI )) -return XFS_ERROR (EINVAL ); - } -#endif -return 0 ; }