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/small-io.sm

    r7941 r8397  
    6161        struct PINT_smcb *smcb, job_status_s *js_p) 
    6262{ 
     63    gossip_debug(GOSSIP_IO_DEBUG,"Executing small_io_start_job...\n"); 
     64 
    6365    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT); 
    6466    int ret; 
    … …  
    181183         
    182184        s_op->u.small_io.result_bytes = result.bytes; 
     185 
     186        gossip_debug(GOSSIP_IO_DEBUG,"\tsubmitting job_trove_bstream_read_list for handle %llu\n" 
     187                                    ,llu(s_op->req->u.small_io.handle)); 
    183188        ret = job_trove_bstream_read_list( 
    184189            s_op->req->u.small_io.fs_id,