Show
Ignore:
Timestamp:
02/03/11 13:20:37 (2 years ago)
Author:
mtmoore
Message:

additional kernel module changes around xattr_handler and fixing of checks from HANLDER to HANDLER. Also add check for fsync in newer kernels that don't take second dentry parameter

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/Orange-Branch/src/kernel/linux-2.6/acl.c

    r8686 r8724  
    382382 
    383383static int pvfs2_xattr_get_acl_access( 
    384 #ifdef HAVE_XATTR_HANLDER_GET_FIVE_PARAM 
     384#ifdef HAVE_XATTR_HANDLER_GET_FIVE_PARAM 
    385385        struct dentry *dentry, 
    386386#else 
    387387        struct inode *inode, 
    388 #endif /* HAVE_XATTR_HANLDER_GET_FIVE_PARAM */ 
     388#endif /* HAVE_XATTR_HANDLER_GET_FIVE_PARAM */ 
    389389        const char *name,  
    390390        void *buffer,  
    391391        size_t size 
    392 #ifdef HAVE_XATTR_HANLDER_GET_FIVE_PARAM 
     392#ifdef HAVE_XATTR_HANDLER_GET_FIVE_PARAM 
    393393        , int handler_flag 
    394 #endif /* HAVE_XATTR_HANLDER_GET_FIVE_PARAM */ 
     394#endif /* HAVE_XATTR_HANDLER_GET_FIVE_PARAM */ 
    395395        ) 
    396396{ 
    … …  
    401401        return -EINVAL; 
    402402    } 
    403 #ifdef HAVE_XATTR_HANLDER_GET_FIVE_PARAM 
     403#ifdef HAVE_XATTR_HANDLER_GET_FIVE_PARAM 
    404404    return pvfs2_xattr_get_acl(dentry->d_inode, ACL_TYPE_ACCESS, buffer, size); 
    405405#else 
    406406    return pvfs2_xattr_get_acl(inode, ACL_TYPE_ACCESS, buffer, size); 
    407 #endif /* HAVE_XATTR_HANLDER_GET_FIVE_PARAM */ 
     407#endif /* HAVE_XATTR_HANDLER_GET_FIVE_PARAM */ 
    408408} 
    409409 
    410410static int pvfs2_xattr_get_acl_default( 
    411 #ifdef HAVE_XATTR_HANLDER_GET_FIVE_PARAM 
     411#ifdef HAVE_XATTR_HANDLER_GET_FIVE_PARAM 
    412412        struct dentry *dentry, 
    413413#else 
    414414        struct inode *inode, 
    415 #endif /* HAVE_XATTR_HANLDER_GET_FIVE_PARAM */ 
     415#endif /* HAVE_XATTR_HANDLER_GET_FIVE_PARAM */ 
    416416        const char *name,  
    417417        void *buffer,  
    418418        size_t size 
    419 #ifdef HAVE_XATTR_HANLDER_GET_FIVE_PARAM 
     419#ifdef HAVE_XATTR_HANDLER_GET_FIVE_PARAM 
    420420        , int handler_flags 
    421 #endif /* HAVE_XATTR_HANLDER_GET_FIVE_PARAM */ 
     421#endif /* HAVE_XATTR_HANDLER_GET_FIVE_PARAM */ 
    422422        ) 
    423423{ 
    … …  
    428428        return -EINVAL; 
    429429    } 
    430 #ifdef HAVE_XATTR_HANLDER_GET_FIVE_PARAM 
     430#ifdef HAVE_XATTR_HANDLER_GET_FIVE_PARAM 
    431431    return pvfs2_xattr_get_acl(dentry->d_inode, ACL_TYPE_DEFAULT, buffer, size); 
    432432#else 
    433433    return pvfs2_xattr_get_acl(inode, ACL_TYPE_DEFAULT, buffer, size); 
    434 #endif /* HAVE_XATTR_HANLDER_GET_FIVE_PARAM */ 
     434#endif /* HAVE_XATTR_HANDLER_GET_FIVE_PARAM */ 
    435435} 
    436436 
    … …  
    497497 
    498498static int pvfs2_xattr_set_acl_access( 
    499 #ifdef HAVE_XATTR_HANLDER_SET_SIX_PARAM 
     499#ifdef HAVE_XATTR_HANDLER_SET_SIX_PARAM 
    500500        struct dentry *dentry, 
    501501#else 
    502502        struct inode *inode,  
    503 #endif /* HAVE_XATTR_HANLDER_SET_SIX_PARAM */ 
     503#endif /* HAVE_XATTR_HANDLER_SET_SIX_PARAM */ 
    504504        const char *name,  
    505505        const void *buffer,  
    506506        size_t size,  
    507507        int flags 
    508 #ifdef HAVE_XATTR_HANLDER_SET_SIX_PARAM 
     508#ifdef HAVE_XATTR_HANDLER_SET_SIX_PARAM 
    509509        , int handler_flags 
    510 #endif /* HAVE_XATTR_HANLDER_SET_SIX_PARAM */ 
     510#endif /* HAVE_XATTR_HANDLER_SET_SIX_PARAM */ 
    511511        ) 
    512512{ 
    … …  
    517517        return -EINVAL; 
    518518    } 
    519 #ifdef HAVE_XATTR_HANLDER_SET_SIX_PARAM 
     519#ifdef HAVE_XATTR_HANDLER_SET_SIX_PARAM 
    520520    return pvfs2_xattr_set_acl(dentry->d_inode, ACL_TYPE_ACCESS, buffer, size); 
    521521#else 
    522522    return pvfs2_xattr_set_acl(inode, ACL_TYPE_ACCESS, buffer, size); 
    523 #endif /* HAVE_XATTR_HANLDER_SET_SIX_PARAM */ 
     523#endif /* HAVE_XATTR_HANDLER_SET_SIX_PARAM */ 
    524524} 
    525525 
    526526static int pvfs2_xattr_set_acl_default( 
    527 #ifdef HAVE_XATTR_HANLDER_SET_SIX_PARAM 
     527#ifdef HAVE_XATTR_HANDLER_SET_SIX_PARAM 
    528528        struct dentry *dentry, 
    529529#else 
    530530        struct inode *inode,  
    531 #endif 
     531#endif /* HAVE_XATTR_HANDLER_SET_SIX_PARAM */ 
    532532        const char *name,  
    533533        const void *buffer,  
    534534        size_t size,  
    535535        int flags 
    536 #ifdef HAVE_XATTR_HANLDER_SET_SIX_PARAM 
     536#ifdef HAVE_XATTR_HANDLER_SET_SIX_PARAM 
    537537        , int handler_flags 
    538 #endif /* #ifdef HAVE_XATTR_HANLDER_SET_SIX_PARAM */ 
     538#endif /* HAVE_XATTR_HANDLER_SET_SIX_PARAM */ 
    539539        ) 
    540540{ 
    … …  
    545545        return -EINVAL; 
    546546    } 
    547 #ifdef HAVE_XATTR_HANLDER_SET_SIX_PARAM 
     547#ifdef HAVE_XATTR_HANDLER_SET_SIX_PARAM 
    548548    return pvfs2_xattr_set_acl(dentry->d_inode, ACL_TYPE_DEFAULT, buffer, size); 
    549549#else