Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f4cbecd authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] XFS propagates MS_NOATIME through two levels internally but doesn't 


actually use it.  Kill this dead code.	Signed-off-by: Christoph Hellwig
<hch@lst.de>

SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:25086a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 0c9512d7

fs/xfs/linux-2.6/xfs_super.c

+0 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ xfs_args_allocate( 
	strncpy(args->fsname, sb->s_id, MAXNAMELEN);



	/* Copy the already-parsed mount(2) flags we're interested in */

	if (sb->s_flags & MS_NOATIME)

		args->flags |= XFSMNT_NOATIME;

	if (sb->s_flags & MS_DIRSYNC)

		args->flags |= XFSMNT_DIRSYNC;

	if (sb->s_flags & MS_SYNCHRONOUS)

fs/xfs/xfs_clnt.h

+0 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ struct xfs_mount_args { 
						 * enforcement */

#define XFSMNT_PQUOTAENF	0x00000040	/* IRIX project quota limit

						 * enforcement */

#define XFSMNT_NOATIME		0x00000100	/* don't modify access

						 * times on reads */

#define XFSMNT_NOALIGN		0x00000200	/* don't allocate at

						 * stripe boundaries*/

#define XFSMNT_RETERR		0x00000400	/* return error to user */

fs/xfs/xfs_mount.h

+0 −2
Original line number Diff line number Diff line
@@ -386,8 +386,6 @@ typedef struct xfs_mount { 
#define XFS_MOUNT_FS_SHUTDOWN	(1ULL << 4)	/* atomic stop of all filesystem

						   operations, typically for

						   disk errors in metadata */

#define XFS_MOUNT_NOATIME	(1ULL << 5)	/* don't modify inode access

						   times on reads */

#define XFS_MOUNT_RETERR	(1ULL << 6)     /* return alignment errors to

						   user */

#define XFS_MOUNT_NOALIGN	(1ULL << 7)	/* turn off stripe alignment

fs/xfs/xfs_vfsops.c

+0 −7
Original line number Diff line number Diff line
@@ -258,8 +258,6 @@ xfs_start_flags( 
		mp->m_inoadd = XFS_INO64_OFFSET;

	}

#endif

	if (ap->flags & XFSMNT_NOATIME)

		mp->m_flags |= XFS_MOUNT_NOATIME;

	if (ap->flags & XFSMNT_RETERR)

		mp->m_flags |= XFS_MOUNT_RETERR;

	if (ap->flags & XFSMNT_NOALIGN)
@@ -654,11 +652,6 @@ xfs_mntupdate( 
	xfs_mount_t	*mp = XFS_BHVTOM(bdp);

	int		error;



	if (args->flags & XFSMNT_NOATIME)

		mp->m_flags |= XFS_MOUNT_NOATIME;

	else

		mp->m_flags &= ~XFS_MOUNT_NOATIME;



	if (args->flags & XFSMNT_BARRIER)

		mp->m_flags |= XFS_MOUNT_BARRIER;

	else