Changeset 8398

Show
Ignore:
Timestamp:
06/20/10 16:49:33 (3 years ago)
Author:
nlmills
Message:

encoding fixes

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

Legend:

Unmodified
Added
Removed

  • branches/cu-security-branch/include/pvfs2-encode-stubs.h

    r8397 r8398  
    5454#define endecode_fields_5_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5) struct endecode_fake_struct 
    5555#define endecode_fields_6(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6) struct endecode_fake_struct 
     56#define endecode_fields_6_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6) struct endecode_fake_struct 
    5657#define endecode_fields_7_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7) struct endecode_fake_struct 
    5758#define endecode_fields_8_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8) struct endecode_fake_struct 
    … …  
    7172#define endecode_fields_4a_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,tn1,n1,ta1,a1) struct endecode_fake_struct 
    7273#define endecode_fields_5a_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,tn1,n1,ta1,a1) struct endecode_fake_struct 
     74#define endecode_fields_3a2a_struct(n,t1,x1,t2,x2,t3,x3,tn1,n1,ta1,a1,t4,x4,t5,x5,tn2,n2,ta2,a2) struct endecode_fake_struct 
    7375 
    7476#define encode_enum_union_2_struct(name, ename, uname, ut1, un1, en1, ut2, un2, en2) struct endecode_fake_struct 

  • branches/cu-security-branch/include/pvfs2-types.h

    r8397 r8398  
    925925    uint32_t, op_mask, 
    926926    uint32_t, num_handles, 
    927     PVFS_handle, handle_array) 
     927    PVFS_handle, handle_array); 
    928928#define extra_size_PVFS_capability (PVFS_REQ_LIMIT_HANDLES_COUNT * \ 
    929929                                    sizeof(PVFS_handle)          + \ 
    … …  
    952952    PVFS_time, timeout, 
    953953    uint32_t, sig_size, 
    954     PVFS_signature, signature) 
     954    PVFS_signature, signature); 
    955955#define extra_size_PVFS_credential (PVFS_REQ_LIMIT_GROUPS    * \ 
    956956                                    sizeof(PVFS_gid)         + \ 

  • branches/cu-security-branch/src/proto/PINT-le-bytefield.c

    r8397 r8398  
    955955            case PVFS_SERV_LISTEATTR: 
    956956            case PVFS_SERV_BATCH_REMOVE: 
    957             case PVFS_SERV_UNSTUFF: 
    958957            case PVFS_SERV_IMM_COPIES: 
    959958              /*nothing to free*/ 

  • branches/cu-security-branch/src/proto/pvfs2-req-proto.h

    r8397 r8398  
    336336    PVFS_fs_id, fs_id, 
    337337    int32_t, handle_count, 
    338     PVFS_handle, handles) 
     338    PVFS_handle, handles); 
    339339#define extra_size_PVFS_servreq_batch_remove \ 
    340340  (PVFS_REQ_LIMIT_HANDLES_COUNT * sizeof(PVFS_handle)) 
    … …  
    604604endecode_fields_1_struct( 
    605605    PVFS_servresp_getattr, 
    606     PVFS_object_attr, attr) 
     606    PVFS_object_attr, attr); 
    607607#define extra_size_PVFS_servresp_getattr \ 
    608608    extra_size_PVFS_object_attr 
    … …  
    11401140    skip4,, 
    11411141    PVFS_size, size, 
    1142     int32_t, flags) 
     1142    int32_t, flags); 
    11431143#define PINT_SERVREQ_TRUNCATE_FILL(__req,  \ 
    11441144                                __cap,     \ 
    … …  
    11661166endecode_fields_1_struct( 
    11671167    PVFS_servreq_statfs, 
    1168     PVFS_fs_id, fs_id) 
     1168    PVFS_fs_id, fs_id); 
    11691169 
    11701170#define PINT_SERVREQ_STATFS_FILL(__req, __cap, __fsid, __hints)\ 
    … …  
    14701470    skip4,, 
    14711471    uint32_t, nhandles, 
    1472     PVFS_handle, handles) 
     1472    PVFS_handle, handles); 
    14731473#define extra_size_PVFS_servreq_listattr \ 
    14741474    (PVFS_REQ_LIMIT_LISTATTR * sizeof(PVFS_handle))