lkml.org 
[lkml]   [2007]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 04/24] udf: convert UDF_SB_VOLIDENT macro to udf_sb_volume_ident function
    Date
    From
    - change UDF_SB_VOLIDENT macro to udf_sb_volume_ident inline function
    - rename s_volident field to s_volume_ident

    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    CC: Ben Fennema <bfennema@falcon.csc.calpoly.edu>
    CC: Jan Kara <jack@suse.cz>
    ---
    fs/udf/file.c | 2 +-
    fs/udf/super.c | 6 +++---
    fs/udf/udf_sb.h | 6 +++++-
    include/linux/udf_fs_sb.h | 2 +-
    4 files changed, 10 insertions(+), 6 deletions(-)

    diff --git a/fs/udf/file.c b/fs/udf/file.c
    index 7c7a1b3..7b61dae 100644
    --- a/fs/udf/file.c
    +++ b/fs/udf/file.c
    @@ -192,7 +192,7 @@ int udf_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
    switch (cmd) {
    case UDF_GETVOLIDENT:
    return copy_to_user((char __user *)arg,
    - UDF_SB_VOLIDENT(inode->i_sb), 32) ? -EFAULT : 0;
    + udf_sb_volume_ident(inode->i_sb), 32) ? -EFAULT : 0;
    case UDF_RELOCATE_BLOCKS:
    if (!capable(CAP_SYS_ADMIN))
    return -EACCES;
    diff --git a/fs/udf/super.c b/fs/udf/super.c
    index 2c68272..42de326 100644
    --- a/fs/udf/super.c
    +++ b/fs/udf/super.c
    @@ -873,9 +873,9 @@ static void udf_load_pvoldesc(struct super_block *sb, struct buffer_head *bh)

    if (!udf_build_ustr(&instr, pvoldesc->volIdent, 32)) {
    if (udf_CS0toUTF8(&outstr, &instr)) {
    - strncpy(UDF_SB_VOLIDENT(sb), outstr.u_name,
    + strncpy(udf_sb_volume_ident(sb), outstr.u_name,
    outstr.u_len > 31 ? 31 : outstr.u_len);
    - udf_debug("volIdent[] = '%s'\n", UDF_SB_VOLIDENT(sb));
    + udf_debug("volIdent[] = '%s'\n", udf_sb_volume_ident(sb));
    }
    }

    @@ -1582,7 +1582,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
    udf_info("UDF %s (%s) Mounting volume '%s', "
    "timestamp %04u/%02u/%02u %02u:%02u (%x)\n",
    UDFFS_VERSION, UDFFS_DATE,
    - UDF_SB_VOLIDENT(sb), ts.year, ts.month, ts.day, ts.hour, ts.minute,
    + udf_sb_volume_ident(sb), ts.year, ts.month, ts.day, ts.hour, ts.minute,
    ts.typeAndTimezone);
    }
    if (!(sb->s_flags & MS_RDONLY))
    diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
    index 46ddfb0..fa7fdff 100644
    --- a/fs/udf/udf_sb.h
    +++ b/fs/udf/udf_sb.h
    @@ -55,6 +55,11 @@ static inline void udf_sb_free(struct super_block *sb)
    }
    }

    +static inline __u8 *udf_sb_volume_ident(struct super_block *sb)
    +{
    + return udf_sb(sb)->s_volume_ident;
    +}
    +
    #define UDF_SB_ALLOC_PARTMAPS(X,Y)\
    {\
    udf_sb(X)->s_partmaps = kmalloc(sizeof(struct udf_part_map) * Y, GFP_KERNEL);\
    @@ -119,7 +124,6 @@ static inline void udf_sb_free(struct super_block *sb)
    #define UDF_SB_BITMAP(X,Y,Z,I) ( udf_sb_partmaps(X)[(Y)].Z.s_bitmap->s_block_bitmap[I] )
    #define UDF_SB_BITMAP_NR_GROUPS(X,Y,Z) ( udf_sb_partmaps(X)[(Y)].Z.s_bitmap->s_nr_groups )

    -#define UDF_SB_VOLIDENT(X) ( udf_sb(X)->s_volident )
    #define UDF_SB_NUMPARTS(X) ( udf_sb(X)->s_partitions )
    #define UDF_SB_PARTITION(X) ( udf_sb(X)->s_partition )
    #define UDF_SB_SESSION(X) ( udf_sb(X)->s_session )
    diff --git a/include/linux/udf_fs_sb.h b/include/linux/udf_fs_sb.h
    index 80ae9ef..a1addf6 100644
    --- a/include/linux/udf_fs_sb.h
    +++ b/include/linux/udf_fs_sb.h
    @@ -75,7 +75,7 @@ struct udf_part_map
    struct udf_sb_info
    {
    struct udf_part_map *s_partmaps;
    - __u8 s_volident[32];
    + __u8 s_volume_ident[32];

    /* Overall info */
    __u16 s_partitions;
    --
    1.5.3.4


    \
     
     \ /
      Last update: 2007-12-23 02:55    [W:0.142 / U:28.796 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site