lkml.org 
[lkml]   [2009]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 1/4] reiserfs: clean up ifdefs
     With xattr cleanup even with xattrs disabled, much of the initial setup
    is still performed. Some #ifdefs are just not needed since the options
    they protect wouldn't be available anyway.

    This patch cleans those up.

    Signed-off-by: Jeff Mahoney <jeffm@suse.com>
    ---
    fs/reiserfs/xattr.c | 49 ++++++++++++++++++++++++-------------------------
    1 file changed, 24 insertions(+), 25 deletions(-)

    --- a/fs/reiserfs/xattr.c
    +++ b/fs/reiserfs/xattr.c
    @@ -685,20 +685,6 @@ out:
    return err;
    }

    -/* Actual operations that are exported to VFS-land */
    -struct xattr_handler *reiserfs_xattr_handlers[] = {
    - &reiserfs_xattr_user_handler,
    - &reiserfs_xattr_trusted_handler,
    -#ifdef CONFIG_REISERFS_FS_SECURITY
    - &reiserfs_xattr_security_handler,
    -#endif
    -#ifdef CONFIG_REISERFS_FS_POSIX_ACL
    - &reiserfs_posix_acl_access_handler,
    - &reiserfs_posix_acl_default_handler,
    -#endif
    - NULL
    -};
    -
    /*
    * In order to implement different sets of xattr operations for each xattr
    * prefix with the generic xattr API, a filesystem should create a
    @@ -922,6 +908,28 @@ static int create_privroot(struct dentry
    return 0;
    }

    +#else
    +int __init reiserfs_xattr_register_handlers(void) { return 0; }
    +void reiserfs_xattr_unregister_handlers(void) {}
    +static int create_privroot(struct dentry *dentry) { return 0; }
    +#endif
    +
    +/* Actual operations that are exported to VFS-land */
    +struct xattr_handler *reiserfs_xattr_handlers[] = {
    +#ifdef CONFIG_REISERFS_FS_XATTR
    + &reiserfs_xattr_user_handler,
    + &reiserfs_xattr_trusted_handler,
    +#endif
    +#ifdef CONFIG_REISERFS_FS_SECURITY
    + &reiserfs_xattr_security_handler,
    +#endif
    +#ifdef CONFIG_REISERFS_FS_POSIX_ACL
    + &reiserfs_posix_acl_access_handler,
    + &reiserfs_posix_acl_default_handler,
    +#endif
    + NULL
    +};
    +
    static int xattr_mount_check(struct super_block *s)
    {
    /* We need generation numbers to ensure that the oid mapping is correct
    @@ -941,11 +949,6 @@ static int xattr_mount_check(struct supe
    return 0;
    }

    -#else
    -int __init reiserfs_xattr_register_handlers(void) { return 0; }
    -void reiserfs_xattr_unregister_handlers(void) {}
    -#endif
    -
    /* This will catch lookups from the fs root to .reiserfs_priv */
    static int
    xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name)
    @@ -992,7 +995,6 @@ int reiserfs_xattr_init(struct super_blo
    int err = 0;
    struct dentry *privroot = REISERFS_SB(s)->priv_root;

    -#ifdef CONFIG_REISERFS_FS_XATTR
    err = xattr_mount_check(s);
    if (err)
    goto error;
    @@ -1023,14 +1025,11 @@ error:
    clear_bit(REISERFS_XATTRS_USER, &(REISERFS_SB(s)->s_mount_opt));
    clear_bit(REISERFS_POSIXACL, &(REISERFS_SB(s)->s_mount_opt));
    }
    -#endif

    /* The super_block MS_POSIXACL must mirror the (no)acl mount option. */
    -#ifdef CONFIG_REISERFS_FS_POSIX_ACL
    if (reiserfs_posixacl(s))
    s->s_flags |= MS_POSIXACL;
    else
    -#endif
    s->s_flags &= ~MS_POSIXACL;

    return err;


    \
     
     \ /
      Last update: 2009-05-17 07:09    [W:0.023 / U:0.324 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site