Author: mckusick
Date: Mon Oct 16 21:55:31 2017
New Revision: 324675
URL: https://svnweb.freebsd.org/changeset/base/324675

Log:
  MFC of 324456.
  
  Do not report filesystem as modified if only timestamp updated in superblock.

Modified:
  stable/10/sbin/fsck_ffs/main.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/fsck_ffs/main.c
==============================================================================
--- stable/10/sbin/fsck_ffs/main.c      Mon Oct 16 21:53:29 2017        
(r324674)
+++ stable/10/sbin/fsck_ffs/main.c      Mon Oct 16 21:55:31 2017        
(r324675)
@@ -231,6 +231,7 @@ checkfilesys(char *filesys)
        struct group *grp;
        struct iovec *iov;
        char errmsg[255];
+       int ofsmodified;
        int iovlen;
        int cylno;
        intmax_t blks, files;
@@ -425,10 +426,15 @@ checkfilesys(char *filesys)
                }
                /*
                 * Write the superblock so we don't try to recover the
-                * journal on another pass.
+                * journal on another pass. If this is the only change
+                * to the filesystem, we do not want it to be called
+                * out as modified.
                 */
                sblock.fs_mtime = time(NULL);
                sbdirty();
+               ofsmodified = fsmodified;
+               flush(fswritefd, &sblk);
+               fsmodified = ofsmodified;
        }
 
        /*
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to