Show
Ignore:
Timestamp:
06/18/10 20:02:50 (3 years ago)
Author:
nlmills
Message:

initial merge with Orange-Branch. much will be broken

Location:
branches/cu-security-branch
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • branches/cu-security-branch

    • Property svn:ignore

      •  

        old new  
        33aclocal.m4 
        44autom4te.cache 
        5 config.status 
        6 Makefile 
        7 pvfs2-config.h 
        8 module.mk 

  • branches/cu-security-branch/src/server

    • Property svn:ignore deleted

  • branches/cu-security-branch/src/server/set-attr.sm

    r8362 r8397  
    330330        "  WRITING attrs: [owner = %d, group = %d\n\t" 
    331331        "perms = %o, type = %d, atime = %llu, mtime = %llu\n\t" 
    332         "ctime = %llu | dfile_count = %d | dist_size = %d]\n", 
     332        "ctime = %llu | dfile_count = %d | dist_size = %d\n\t" 
     333        "handle = %llu | S = %p | mask = %d]\n", 
    333334        dspace_a_p->owner, dspace_a_p->group, dspace_a_p->perms, 
    334335        dspace_a_p->objtype, llu(dspace_a_p->atime), 
    335336        llu(PINT_util_mkversion_time(dspace_a_p->mtime)), llu(dspace_a_p->ctime), 
    336337        (int)dspace_a_p->u.meta.dfile_count, 
    337         (int)dspace_a_p->u.meta.dist_size); 
     338        (int)dspace_a_p->u.meta.dist_size, 
     339        llu(s_op->req->u.setattr.handle), s_op, a_p->mask); 
    338340 
    339341    /* translate attrs to storage attr format */