Author: dchagin
Date: Sun Apr  3 06:33:16 2016
New Revision: 297519
URL: https://svnweb.freebsd.org/changeset/base/297519

Log:
  Move Linux specific times tests up to guarantee the values are defined.
  
  CID:          1305178
  Submitted by: pfg@
  MFC after:    1 week

Modified:
  head/sys/compat/linux/linux_misc.c

Modified: head/sys/compat/linux/linux_misc.c
==============================================================================
--- head/sys/compat/linux/linux_misc.c  Sun Apr  3 06:22:36 2016        
(r297518)
+++ head/sys/compat/linux/linux_misc.c  Sun Apr  3 06:33:16 2016        
(r297519)
@@ -895,13 +895,14 @@ linux_utimensat(struct thread *td, struc
                        break;
                }
                timesp = times;
-       }
 
-       if (times[0].tv_nsec == UTIME_OMIT && times[1].tv_nsec == UTIME_OMIT)
+               if (times[0].tv_nsec == UTIME_OMIT &&
+                   times[1].tv_nsec == UTIME_OMIT)
                /* This breaks POSIX, but is what the Linux kernel does
                 * _on purpose_ (documented in the man page for utimensat(2)),
                 * so we must follow that behaviour. */
                return (0);
+       }
 
        if (args->pathname != NULL)
                LCONVPATHEXIST_AT(td, args->pathname, &path, dfd);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to