Commit 86ba9ed9 authored by Yaowei Bai's avatar Yaowei Bai Committed by Richard Weinberger

fs/ubifs: remove unnecessary new_valid_dev check

As currently new_valid_dev always returns 1, so new_valid_dev check is not
needed, remove it.
Signed-off-by: default avatarYaowei Bai <bywxiaobai@163.com>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 1cb8f977
...@@ -787,9 +787,6 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry, ...@@ -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); 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)) { if (S_ISBLK(mode) || S_ISCHR(mode)) {
dev = kmalloc(sizeof(union ubifs_dev_desc), GFP_NOFS); dev = kmalloc(sizeof(union ubifs_dev_desc), GFP_NOFS);
if (!dev) if (!dev)
......
...@@ -155,13 +155,8 @@ static inline int ubifs_wbuf_sync(struct ubifs_wbuf *wbuf) ...@@ -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) 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));
dev->new = cpu_to_le32(new_encode_dev(rdev)); return sizeof(dev->new);
return sizeof(dev->new);
} else {
dev->huge = cpu_to_le64(huge_encode_dev(rdev));
return sizeof(dev->huge);
}
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment