openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Yaowei Bai <bywxiaobai@163.com>
Reviewed-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Yaowei Bai 2015-09-29 21:57:33 +08:00 committed by Richard Weinberger
parent 1cb8f9776c
commit 86ba9ed928
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ubifs/dir.c
View File

@ -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)

5
fs/ubifs/misc.h
View File

@ -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);
}
} }
/** /**