Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86ba9ed9 authored Sep 29, 2015 by Yaowei Bai Committed by Richard Weinberger Nov 06, 2015

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>

parent 1cb8f977

fs/ubifs/dir.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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)

fs/ubifs/misc.h

+2 −7

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

		/**