[SCM] Samba Shared Repository - branch v3-2-test updated
- release-3-2-0pre2-2967-g0cba300
SATOH Fumiyasu
fumiyas at osstech.jp
Fri Aug 29 01:58:39 GMT 2008
At Thu, 28 Aug 2008 14:11:15 -0500 (CDT),
Jeremy Allison wrote:
> commit 0cba30073410ba499834ac26dee3f81a75c8de4f
> Author: Jeremy Allison <jra at samba.org>
> Date: Thu Aug 28 12:09:06 2008 -0700
>
> Add st_birthtime and friends for accurate create times on systems that support it (*BSD and MacOSX). This really needs to be in 3.2.x.
> Should have done this ages ago, sorry.
> Jeremy.
If a filesystem (e.g. UFSv1) does not support birthtimes,
pst->st_birthtime* have invalid value.
You should ignore pst->st_birthtime* on that case
and fallback to legacy code (calc_create_time()).
How to check if pst->st_birthtime* are valid or not?
I think Samba should fallback to calc_create_time()
when:
(1) pst->st_birthtime == (time_t)0 (if pst has no st_birthtimensec)
(2) pst->st_birthtime == (time_t)0 and pst->st_birthtimensec == 0L
(3) pst->st_birthtime == (time_t)0 and pst->st_birthtimensec == -1L
(4) pst->st_birthtime == (time_t)-1 (if pst has no st_birthtimensec)
(5) pst->st_birthtime == (time_t)-1 and pst->st_birthtimensec == -1L
I've NOT confirmed that there is standard specification for
st_birthtime* (especially, what value indicates that
a filesystem does not suport it), and the above (1)-(5)
conditions are suitable for judgement.
FYI.
http://www.nabble.com/birthtime-initialization-td18584558.html
--
-- Name: SATOH Fumiyasu (fumiyas @ osstech co jp)
-- Business Home: http://www.OSSTech.co.jp/
-- Personal Home: http://www.SFO.jp/blog/
> -----------------------------------------------------------------------
>
> Summary of changes:
> source/configure.in | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
> source/lib/time.c | 40 +++++++++++++++++------
> source/smbd/reply.c | 7 ++--
> 3 files changed, 124 insertions(+), 13 deletions(-)
>
>
> Changeset truncated at 500 lines:
>
> diff --git a/source/configure.in b/source/configure.in
> index 0086be7..3c699d5 100644
> --- a/source/configure.in
> +++ b/source/configure.in
> @@ -1334,6 +1334,96 @@ if test x"$samba_cv_stat_hires_notimespec" = x"yes" ; then
> [whether struct stat has sub-second timestamps without struct timespec])
> fi
>
> +AC_CACHE_CHECK([whether struct stat has st_birthtimespec], samba_cv_stat_st_birthtimespec,
> + [
> + AC_TRY_COMPILE(
> + [
> +#if TIME_WITH_SYS_TIME
> +# include <sys/time.h>
> +# include <time.h>
> +#else
> +# if HAVE_SYS_TIME_H
> +# include <sys/time.h>
> +# else
> +# include <time.h>
> +# endif
> +#endif
> +#ifdef HAVE_SYS_STAT_H
> +#include <sys/stat.h>
> +#endif
> + ],
> + [
> + struct timespec t;
> + struct stat s = {0};
> + t = s.st_birthtimespec;
> + ],
> + samba_cv_stat_st_birthtimespec=yes, samba_cv_stat_birthtimespec=no)
> + ])
> +
> +if test x"$samba_cv_stat_st_birthtimespec" = x"yes" ; then
> + AC_DEFINE(HAVE_STAT_ST_BIRTHTIMESPEC, 1, [whether struct stat contains st_birthtimespec])
> +fi
> +
> +AC_CACHE_CHECK([whether struct stat has st_birthtimensec], samba_cv_stat_st_birthtimensec,
> + [
> + AC_TRY_COMPILE(
> + [
> +#if TIME_WITH_SYS_TIME
> +# include <sys/time.h>
> +# include <time.h>
> +#else
> +# if HAVE_SYS_TIME_H
> +# include <sys/time.h>
> +# else
> +# include <time.h>
> +# endif
> +#endif
> +#ifdef HAVE_SYS_STAT_H
> +#include <sys/stat.h>
> +#endif
> + ],
> + [
> + struct timespec t;
> + struct stat s = {0};
> + t.tv_nsec = s.st_birthtimensec;
> + ],
> + samba_cv_stat_st_birthtimensec=yes, samba_cv_stat_birthtimensec=no)
> + ])
> +
> +if test x"$samba_cv_stat_st_birthtimensec" = x"yes" ; then
> + AC_DEFINE(HAVE_STAT_ST_BIRTHTIMENSEC, 1, [whether struct stat contains st_birthtimensec])
> +fi
> +
> +AC_CACHE_CHECK([whether struct stat has st_birthtime], samba_cv_stat_st_birthtime,
> + [
> + AC_TRY_COMPILE(
> + [
> +#if TIME_WITH_SYS_TIME
> +# include <sys/time.h>
> +# include <time.h>
> +#else
> +# if HAVE_SYS_TIME_H
> +# include <sys/time.h>
> +# else
> +# include <time.h>
> +# endif
> +#endif
> +#ifdef HAVE_SYS_STAT_H
> +#include <sys/stat.h>
> +#endif
> + ],
> + [
> + struct time_t t;
> + struct stat s = {0};
> + t = s.st_birthtime;
> + ],
> + samba_cv_stat_st_birthtime=yes, samba_cv_stat_birthtime=no)
> + ])
> +
> +if test x"$samba_cv_stat_st_birthtime" = x"yes" ; then
> + AC_DEFINE(HAVE_STAT_ST_BIRTHTIME, 1, [whether struct stat contains st_birthtime])
> +fi
> +
> #####################################
> # needed for SRV lookups
> AC_CHECK_LIB(resolv, dn_expand)
> diff --git a/source/lib/time.c b/source/lib/time.c
> index 17990b9..8ab001e 100644
> --- a/source/lib/time.c
> +++ b/source/lib/time.c
> @@ -826,14 +826,10 @@ void put_long_date(char *p, time_t t)
> structure.
> ****************************************************************************/
>
> -time_t get_create_time(const SMB_STRUCT_STAT *st,bool fake_dirs)
> +static time_t calc_create_time(const SMB_STRUCT_STAT *st)
> {
> time_t ret, ret1;
>
> - if(S_ISDIR(st->st_mode) && fake_dirs) {
> - return (time_t)315493200L; /* 1/1/1980 */
> - }
> -
> ret = MIN(st->st_ctime, st->st_mtime);
> ret1 = MIN(ret, st->st_atime);
>
> @@ -848,12 +844,36 @@ time_t get_create_time(const SMB_STRUCT_STAT *st,bool fake_dirs)
> return ret;
> }
>
> -struct timespec get_create_timespec(const SMB_STRUCT_STAT *st,bool fake_dirs)
> +/****************************************************************************
> + Return the 'create time' from a stat struct if it exists (birthtime) or else
> + use the best approximation.
> +****************************************************************************/
> +
> +struct timespec get_create_timespec(const SMB_STRUCT_STAT *pst,bool fake_dirs)
> {
> - struct timespec ts;
> - ts.tv_sec = get_create_time(st, fake_dirs);
> - ts.tv_nsec = 0;
> - return ts;
> + struct timespec ret;
> +
> + if(S_ISDIR(pst->st_mode) && fake_dirs) {
> + ret.tv_sec = 315493200L; /* 1/1/1980 */
> + ret.tv_nsec = 0;
> + return ret;
> + }
> +
> +#if defined(HAVE_STAT_ST_BIRTHTIMESPEC)
> + return pst->st_birthtimespec;
> +#elif defined(HAVE_STAT_ST_BIRTHTIMENSEC)
> + ret.tv_sec = pst->st_birthtime;
> + ret.tv_nsec = pst->st_birthtimenspec;
> + return ret;
> +#elif defined(HAVE_STAT_ST_BIRTHTIME)
> + ret.tv_sec = pst->st_birthtime;
> + ret.tv_nsec = 0;
> + return ret;
> +#else
> + ret.tv_sec = calc_create_time(pst);
> + ret.tv_nsec = 0;
> + return ret;
> +#endif
> }
>
> /****************************************************************************
> diff --git a/source/smbd/reply.c b/source/smbd/reply.c
> index 31844c5..67b382d 100644
> --- a/source/smbd/reply.c
> +++ b/source/smbd/reply.c
> @@ -7096,6 +7096,7 @@ void reply_getattrE(struct smb_request *req)
> SMB_STRUCT_STAT sbuf;
> int mode;
> files_struct *fsp;
> + struct timespec create_ts;
>
> START_PROFILE(SMBgetattrE);
>
> @@ -7130,9 +7131,9 @@ void reply_getattrE(struct smb_request *req)
>
> reply_outbuf(req, 11, 0);
>
> - srv_put_dos_date2((char *)req->outbuf, smb_vwv0,
> - get_create_time(&sbuf,
> - lp_fake_dir_create_times(SNUM(conn))));
> + create_ts = get_create_timespec(&sbuf,
> + lp_fake_dir_create_times(SNUM(conn)));
> + srv_put_dos_date2((char *)req->outbuf, smb_vwv0, create_ts.tv_sec);
> srv_put_dos_date2((char *)req->outbuf, smb_vwv2, sbuf.st_atime);
> /* Should we check pending modtime here ? JRA */
> srv_put_dos_date2((char *)req->outbuf, smb_vwv4, sbuf.st_mtime);
>
>
> --
> Samba Shared Repository
>
More information about the samba-technical
mailing list