lkml.org 
[lkml]   [2011]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCHv2] fat: don't use custom hex_to_bin()
    Date
    Andy Shevchenko <andriy.shevchenko@linux.intel.com> writes:

    Looks good to me.

    Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

    Or if it's needed, I'll apply this to fat tree.

    > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    > Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    > ---
    > fs/fat/namei_vfat.c | 30 ++++++++----------------------
    > 1 files changed, 8 insertions(+), 22 deletions(-)
    >
    > diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
    > index bb3f29c..cf0fd96 100644
    > --- a/fs/fat/namei_vfat.c
    > +++ b/fs/fat/namei_vfat.c
    > @@ -21,6 +21,8 @@
    > #include <linux/slab.h>
    > #include <linux/buffer_head.h>
    > #include <linux/namei.h>
    > +#include <linux/kernel.h>
    > +
    > #include "fat.h"
    >
    > /*
    > @@ -505,10 +507,8 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname,
    > struct nls_table *nls)
    > {
    > const unsigned char *ip;
    > - unsigned char nc;
    > unsigned char *op;
    > - unsigned int ec;
    > - int i, k, fill;
    > + int i, rc, fill;
    > int charlen;
    >
    > if (utf8) {
    > @@ -528,26 +528,12 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname,
    > if (escape && (*ip == ':')) {
    > if (i > len - 5)
    > return -EINVAL;
    > - ec = 0;
    > - for (k = 1; k < 5; k++) {
    > - nc = ip[k];
    > - ec <<= 4;
    > - if (nc >= '0' && nc <= '9') {
    > - ec |= nc - '0';
    > - continue;
    > - }
    > - if (nc >= 'a' && nc <= 'f') {
    > - ec |= nc - ('a' - 10);
    > - continue;
    > - }
    > - if (nc >= 'A' && nc <= 'F') {
    > - ec |= nc - ('A' - 10);
    > - continue;
    > - }
    > +
    > + rc = hex2bin(op, ip + 1, 2);
    > + if (rc < 0)
    > return -EINVAL;
    > - }
    > - *op++ = ec & 0xFF;
    > - *op++ = ec >> 8;
    > +
    > + op += 2;
    > ip += 5;
    > i += 5;
    > } else {

    --
    OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>


    \
     
     \ /
      Last update: 2011-09-27 19:23    [W:0.035 / U:179.792 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site