Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1234381

Re: [PATCH 17/17] fs/ubifs: remove unnecessary new_valid_dev check

From Richard Weinberger <richard.weinberger@gmail.com>
Newsgroups linux.kernel
Subject Re: [PATCH 17/17] fs/ubifs: remove unnecessary new_valid_dev check
Date 2015-09-28 21:30 +0200
Message-ID <qdMhB-gH-53@gated-at.bofh.it> (permalink)
References <qdGOS-Rc-7@gated-at.bofh.it> <qdI4j-2z9-19@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


On Mon, Sep 28, 2015 at 4:53 PM, Yaowei Bai <bywxiaobai@163.com> wrote:
> As new_valid_dev always returns 1, so new_valid_dev check is not
> needed, remove it.
>
> Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
> ---
>  fs/ubifs/dir.c  | 3 ---
>  fs/ubifs/misc.h | 9 ++-------
>  2 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
> index 5c27c66..1dd9267 100644
> --- a/fs/ubifs/dir.c
> +++ b/fs/ubifs/dir.c
> @@ -787,9 +787,6 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry,
>
>         dbg_gen("dent '%pd' in dir ino %lu", dentry, dir->i_ino);
>
> -       if (!new_valid_dev(rdev))
> -               return -EINVAL;
> -
>         if (S_ISBLK(mode) || S_ISCHR(mode)) {
>                 dev = kmalloc(sizeof(union ubifs_dev_desc), GFP_NOFS);
>                 if (!dev)
> diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
> index ee7cb5e..0197ed6 100644
> --- a/fs/ubifs/misc.h
> +++ b/fs/ubifs/misc.h
> @@ -155,13 +155,8 @@ static inline int ubifs_wbuf_sync(struct ubifs_wbuf *wbuf)
>   */
>  static inline int ubifs_encode_dev(union ubifs_dev_desc *dev, dev_t rdev)
>  {
> -       if (new_valid_dev(rdev)) {
> -               dev->new = cpu_to_le32(new_encode_dev(rdev));
> -               return sizeof(dev->new);
> -       } else {
> -               dev->huge = cpu_to_le64(huge_encode_dev(rdev));
> -               return sizeof(dev->huge);
> -       }
> +       dev->huge = cpu_to_le64(huge_encode_dev(rdev));
> +       return sizeof(dev->huge);

Please be careful.

dev->new = cpu_to_le32(new_encode_dev(rdev));
return sizeof(dev->huge);

...is the correct branch. You enabled the dead one.

-- 
Thanks,
//richard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/17] cleanups of fs about new/huge_valid_dev Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 15:40 +0200
  [PATCH 04/17] fs/btrfs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 15:50 +0200
    Re: [PATCH 04/17] fs/btrfs: remove unnecessary new_valid_dev check David Sterba <dsterba@suse.cz> - 2015-09-29 17:00 +0200
  [PATCH 05/17] fs/exofs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:00 +0200
    Re: [PATCH 05/17] fs/exofs: remove unnecessary new_valid_dev check Boaz Harrosh <ooo@electrozaur.com> - 2015-09-29 15:50 +0200
      Re: [PATCH 05/17] fs/exofs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-29 17:50 +0200
        Re: [PATCH 05/17] fs/exofs: remove unnecessary new_valid_dev check Boaz Harrosh <ooo@electrozaur.com> - 2015-09-30 12:30 +0200
  [PATCH 08/17] fs/f2fs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:00 +0200
  [PATCH 07/17] fs/ext4: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:00 +0200
  [PATCH 06/17] fs/ext2: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:00 +0200
  [PATCH 10/17] fs/jffs2: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:20 +0200
    Re: [PATCH 10/17] fs/jffs2: remove unnecessary new_valid_dev check Brian Norris <computersforpeace@gmail.com> - 2015-09-29 01:30 +0200
  [PATCH 11/17] fs/jfs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:30 +0200
    Re: [Jfs-discussion] [PATCH 11/17] fs/jfs: remove unnecessary  new_valid_dev check Dave Kleikamp <dave.kleikamp@oracle.com> - 2015-09-28 17:50 +0200
  [PATCH 06/17] fs/ext2: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:30 +0200
  [PATCH 09/17] fs/hpfs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:40 +0200
    Re: [PATCH 09/17] fs/hpfs: remove unnecessary new_valid_dev check Mikulas Patocka <mikulas@twibright.com> - 2015-09-29 17:10 +0200
      Re: [PATCH 09/17] fs/hpfs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-30 13:20 +0200
        Re: [PATCH 09/17] fs/hpfs: remove unnecessary new_valid_dev check Mikulas Patocka <mikulas@twibright.com> - 2015-10-01 23:00 +0200
  [PATCH 12/17] fs/ncpfs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:40 +0200
  [PATCH 14/17] fs/nilfs2: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:40 +0200
    Re: [PATCH 14/17] fs/nilfs2: remove unnecessary new_valid_dev check Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> - 2015-09-29 17:20 +0200
  [PATCH 13/17] fs/nfs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 16:40 +0200
  [PATCH 17/17] fs/ubifs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 17:00 +0200
    Re: [PATCH 17/17] fs/ubifs: remove unnecessary new_valid_dev check Richard Weinberger <richard.weinberger@gmail.com> - 2015-09-28 21:30 +0200
      Re: [PATCH 17/17] fs/ubifs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-29 15:50 +0200
  [PATCH 15/17] fs/reiserfs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 17:00 +0200
  [PATCH 16/17] fs/stat: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-28 17:00 +0200
  [PATCH] fs/ubifs: remove unnecessary new_valid_dev check Yaowei Bai <bywxiaobai@163.com> - 2015-09-29 16:10 +0200
    Re: [PATCH] fs/ubifs: remove unnecessary new_valid_dev check Richard Weinberger <richard.weinberger@gmail.com> - 2015-09-30 10:20 +0200
      Re: [PATCH] fs/ubifs: remove unnecessary new_valid_dev check Artem Bityutskiy <dedekind1@gmail.com> - 2015-10-01 15:40 +0200

csiph-web