From: Christoph Hellwig XFS propagates MS_NOATIME through two levels internally but doesn't actually use it. Kill this dead code. Signed-off-by: Christoph Hellwig Cc: Nathan Scott Signed-off-by: Andrew Morton --- fs/xfs/linux-2.6/xfs_super.c | 2 -- fs/xfs/xfs_clnt.h | 2 -- fs/xfs/xfs_mount.h | 2 -- fs/xfs/xfs_vfsops.c | 7 ------- 4 files changed, 13 deletions(-) diff -puN fs/xfs/linux-2.6/xfs_super.c~remove-ms_noatime-mirroring-inside-xfs fs/xfs/linux-2.6/xfs_super.c --- 25/fs/xfs/linux-2.6/xfs_super.c~remove-ms_noatime-mirroring-inside-xfs Fri Jan 13 16:17:21 2006 +++ 25-akpm/fs/xfs/linux-2.6/xfs_super.c Fri Jan 13 16:17:21 2006 @@ -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) diff -puN fs/xfs/xfs_clnt.h~remove-ms_noatime-mirroring-inside-xfs fs/xfs/xfs_clnt.h --- 25/fs/xfs/xfs_clnt.h~remove-ms_noatime-mirroring-inside-xfs Fri Jan 13 16:17:21 2006 +++ 25-akpm/fs/xfs/xfs_clnt.h Fri Jan 13 16:17:21 2006 @@ -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 */ diff -puN fs/xfs/xfs_mount.h~remove-ms_noatime-mirroring-inside-xfs fs/xfs/xfs_mount.h --- 25/fs/xfs/xfs_mount.h~remove-ms_noatime-mirroring-inside-xfs Fri Jan 13 16:17:21 2006 +++ 25-akpm/fs/xfs/xfs_mount.h Fri Jan 13 16:17:21 2006 @@ -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 diff -puN fs/xfs/xfs_vfsops.c~remove-ms_noatime-mirroring-inside-xfs fs/xfs/xfs_vfsops.c --- 25/fs/xfs/xfs_vfsops.c~remove-ms_noatime-mirroring-inside-xfs Fri Jan 13 16:17:21 2006 +++ 25-akpm/fs/xfs/xfs_vfsops.c Fri Jan 13 16:17:21 2006 @@ -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 _