diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-03-13 21:05:30 -0500 | 
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-03-13 21:05:30 -0500 | 
| commit | 9f4cbecd7e5ee6390fecd6032dc04ca8c9805dc9 (patch) | |
| tree | ab8d621cf5852f1d6b4dad602510792b2fd6463c | |
| parent | 0c9512d74635198d90f349acec19381e446ba2b4 (diff) | |
[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: Nathan Scott <nathans@sgi.com>
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_clnt.h | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_mount.h | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_vfsops.c | 7 | 
4 files changed, 0 insertions, 13 deletions
| diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index f22e426d9e42..59989f6f83ef 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
| @@ -76,8 +76,6 @@ xfs_args_allocate( | |||
| 76 | strncpy(args->fsname, sb->s_id, MAXNAMELEN); | 76 | strncpy(args->fsname, sb->s_id, MAXNAMELEN); | 
| 77 | 77 | ||
| 78 | /* Copy the already-parsed mount(2) flags we're interested in */ | 78 | /* Copy the already-parsed mount(2) flags we're interested in */ | 
| 79 | if (sb->s_flags & MS_NOATIME) | ||
| 80 | args->flags |= XFSMNT_NOATIME; | ||
| 81 | if (sb->s_flags & MS_DIRSYNC) | 79 | if (sb->s_flags & MS_DIRSYNC) | 
| 82 | args->flags |= XFSMNT_DIRSYNC; | 80 | args->flags |= XFSMNT_DIRSYNC; | 
| 83 | if (sb->s_flags & MS_SYNCHRONOUS) | 81 | if (sb->s_flags & MS_SYNCHRONOUS) | 
| diff --git a/fs/xfs/xfs_clnt.h b/fs/xfs/xfs_clnt.h index f57cc9ac875e..022fff62085b 100644 --- a/fs/xfs/xfs_clnt.h +++ b/fs/xfs/xfs_clnt.h | |||
| @@ -68,8 +68,6 @@ struct xfs_mount_args { | |||
| 68 | * enforcement */ | 68 | * enforcement */ | 
| 69 | #define XFSMNT_PQUOTAENF 0x00000040 /* IRIX project quota limit | 69 | #define XFSMNT_PQUOTAENF 0x00000040 /* IRIX project quota limit | 
| 70 | * enforcement */ | 70 | * enforcement */ | 
| 71 | #define XFSMNT_NOATIME 0x00000100 /* don't modify access | ||
| 72 | * times on reads */ | ||
| 73 | #define XFSMNT_NOALIGN 0x00000200 /* don't allocate at | 71 | #define XFSMNT_NOALIGN 0x00000200 /* don't allocate at | 
| 74 | * stripe boundaries*/ | 72 | * stripe boundaries*/ | 
| 75 | #define XFSMNT_RETERR 0x00000400 /* return error to user */ | 73 | #define XFSMNT_RETERR 0x00000400 /* return error to user */ | 
| diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index cd3cf9613a00..4c9817a80435 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
| @@ -386,8 +386,6 @@ typedef struct xfs_mount { | |||
| 386 | #define XFS_MOUNT_FS_SHUTDOWN (1ULL << 4) /* atomic stop of all filesystem | 386 | #define XFS_MOUNT_FS_SHUTDOWN (1ULL << 4) /* atomic stop of all filesystem | 
| 387 | operations, typically for | 387 | operations, typically for | 
| 388 | disk errors in metadata */ | 388 | disk errors in metadata */ | 
| 389 | #define XFS_MOUNT_NOATIME (1ULL << 5) /* don't modify inode access | ||
| 390 | times on reads */ | ||
| 391 | #define XFS_MOUNT_RETERR (1ULL << 6) /* return alignment errors to | 389 | #define XFS_MOUNT_RETERR (1ULL << 6) /* return alignment errors to | 
| 392 | user */ | 390 | user */ | 
| 393 | #define XFS_MOUNT_NOALIGN (1ULL << 7) /* turn off stripe alignment | 391 | #define XFS_MOUNT_NOALIGN (1ULL << 7) /* turn off stripe alignment | 
| diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c index b6ad370fab3d..2a0a9efb8ccb 100644 --- a/fs/xfs/xfs_vfsops.c +++ b/fs/xfs/xfs_vfsops.c | |||
| @@ -258,8 +258,6 @@ xfs_start_flags( | |||
| 258 | mp->m_inoadd = XFS_INO64_OFFSET; | 258 | mp->m_inoadd = XFS_INO64_OFFSET; | 
| 259 | } | 259 | } | 
| 260 | #endif | 260 | #endif | 
| 261 | if (ap->flags & XFSMNT_NOATIME) | ||
| 262 | mp->m_flags |= XFS_MOUNT_NOATIME; | ||
| 263 | if (ap->flags & XFSMNT_RETERR) | 261 | if (ap->flags & XFSMNT_RETERR) | 
| 264 | mp->m_flags |= XFS_MOUNT_RETERR; | 262 | mp->m_flags |= XFS_MOUNT_RETERR; | 
| 265 | if (ap->flags & XFSMNT_NOALIGN) | 263 | if (ap->flags & XFSMNT_NOALIGN) | 
| @@ -654,11 +652,6 @@ xfs_mntupdate( | |||
| 654 | xfs_mount_t *mp = XFS_BHVTOM(bdp); | 652 | xfs_mount_t *mp = XFS_BHVTOM(bdp); | 
| 655 | int error; | 653 | int error; | 
| 656 | 654 | ||
| 657 | if (args->flags & XFSMNT_NOATIME) | ||
| 658 | mp->m_flags |= XFS_MOUNT_NOATIME; | ||
| 659 | else | ||
| 660 | mp->m_flags &= ~XFS_MOUNT_NOATIME; | ||
| 661 | |||
| 662 | if (args->flags & XFSMNT_BARRIER) | 655 | if (args->flags & XFSMNT_BARRIER) | 
| 663 | mp->m_flags |= XFS_MOUNT_BARRIER; | 656 | mp->m_flags |= XFS_MOUNT_BARRIER; | 
| 664 | else | 657 | else | 
