tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] ntfs: remove superflous MS_NOATIME/MS_NODIRATIME assignments

MS_RDONLU implies not atime updates at all, no need for the MS_NOATIME and
MS_NODIRATIME flags.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Anton Altaparmakov <aia21@cantab.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Christoph Hellwig and committed by
Linus Torvalds 24a44dca e6a6d2ef

+14 -14
+14 -14
fs/ntfs/super.c
··· 443 443 444 444 ntfs_debug("Entering with remount options string: %s", opt); 445 445 #ifndef NTFS_RW 446 - /* For read-only compiled driver, enforce all read-only flags. */ 447 - *flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 446 + /* For read-only compiled driver, enforce read-only flag. */ 447 + *flags |= MS_RDONLY; 448 448 #else /* NTFS_RW */ 449 449 /* 450 450 * For the read-write compiled driver, if we are remounting read-write, ··· 1721 1721 es3); 1722 1722 goto iput_mirr_err_out; 1723 1723 } 1724 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 1724 + sb->s_flags |= MS_RDONLY; 1725 1725 ntfs_error(sb, "%s. Mounting read-only%s", 1726 1726 !vol->mftmirr_ino ? es1 : es2, es3); 1727 1727 } else ··· 1837 1837 es1, es2); 1838 1838 goto iput_vol_err_out; 1839 1839 } 1840 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 1840 + sb->s_flags |= MS_RDONLY; 1841 1841 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 1842 1842 } else 1843 1843 ntfs_warning(sb, "%s. Will not be able to remount " ··· 1874 1874 } 1875 1875 goto iput_logfile_err_out; 1876 1876 } 1877 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 1877 + sb->s_flags |= MS_RDONLY; 1878 1878 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 1879 1879 } else 1880 1880 ntfs_warning(sb, "%s. Will not be able to remount " ··· 1919 1919 es1, es2); 1920 1920 goto iput_root_err_out; 1921 1921 } 1922 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 1922 + sb->s_flags |= MS_RDONLY; 1923 1923 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 1924 1924 } else 1925 1925 ntfs_warning(sb, "%s. Will not be able to remount " ··· 1943 1943 goto iput_root_err_out; 1944 1944 } 1945 1945 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 1946 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 1946 + sb->s_flags |= MS_RDONLY; 1947 1947 /* 1948 1948 * Do not set NVolErrors() because ntfs_remount() might manage 1949 1949 * to set the dirty flag in which case all would be well. ··· 1970 1970 goto iput_root_err_out; 1971 1971 } 1972 1972 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 1973 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 1973 + sb->s_flags |= MS_RDONLY; 1974 1974 NVolSetErrors(vol); 1975 1975 } 1976 1976 #endif ··· 1989 1989 goto iput_root_err_out; 1990 1990 } 1991 1991 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 1992 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 1992 + sb->s_flags |= MS_RDONLY; 1993 1993 NVolSetErrors(vol); 1994 1994 } 1995 1995 #endif /* NTFS_RW */ ··· 2030 2030 es1, es2); 2031 2031 goto iput_quota_err_out; 2032 2032 } 2033 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 2033 + sb->s_flags |= MS_RDONLY; 2034 2034 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 2035 2035 } else 2036 2036 ntfs_warning(sb, "%s. Will not be able to remount " ··· 2053 2053 goto iput_quota_err_out; 2054 2054 } 2055 2055 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 2056 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 2056 + sb->s_flags |= MS_RDONLY; 2057 2057 NVolSetErrors(vol); 2058 2058 } 2059 2059 /* ··· 2074 2074 es1, es2); 2075 2075 goto iput_usnjrnl_err_out; 2076 2076 } 2077 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 2077 + sb->s_flags |= MS_RDONLY; 2078 2078 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 2079 2079 } else 2080 2080 ntfs_warning(sb, "%s. Will not be able to remount " ··· 2097 2097 goto iput_usnjrnl_err_out; 2098 2098 } 2099 2099 ntfs_error(sb, "%s. Mounting read-only%s", es1, es2); 2100 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 2100 + sb->s_flags |= MS_RDONLY; 2101 2101 NVolSetErrors(vol); 2102 2102 } 2103 2103 #endif /* NTFS_RW */ ··· 2689 2689 2690 2690 ntfs_debug("Entering."); 2691 2691 #ifndef NTFS_RW 2692 - sb->s_flags |= MS_RDONLY | MS_NOATIME | MS_NODIRATIME; 2692 + sb->s_flags |= MS_RDONLY; 2693 2693 #endif /* ! NTFS_RW */ 2694 2694 /* Allocate a new ntfs_volume and place it in sb->s_fs_info. */ 2695 2695 sb->s_fs_info = kmalloc(sizeof(ntfs_volume), GFP_NOFS);