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

Commit 349c7037 authored Nov 09, 2015 by Yaowei Bai Committed by Linus Torvalds Nov 09, 2015

fs/9p: remove unnecessary new_valid_dev() checks



new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8b9758b9

fs/9p/vfs_inode.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1368,9 +1368,6 @@ v9fs_vfs_mknod(struct inode dir, struct dentry dentry, umode_t mode, dev_t rde
	dir->i_ino, dentry, mode,		dir->i_ino, dentry, mode,
	MAJOR(rdev), MINOR(rdev));		MAJOR(rdev), MINOR(rdev));

	if (!new_valid_dev(rdev))
	return -EINVAL;

	/* build extension */		/* build extension */
	if (S_ISBLK(mode))		if (S_ISBLK(mode))
	sprintf(name, "b %u %u", MAJOR(rdev), MINOR(rdev));		sprintf(name, "b %u %u", MAJOR(rdev), MINOR(rdev));

fs/9p/vfs_inode_dotl.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -829,9 +829,6 @@ v9fs_vfs_mknod_dotl(struct inode dir, struct dentry dentry, umode_t omode,
	dir->i_ino, dentry, omode,		dir->i_ino, dentry, omode,
	MAJOR(rdev), MINOR(rdev));		MAJOR(rdev), MINOR(rdev));

	if (!new_valid_dev(rdev))
	return -EINVAL;

	v9ses = v9fs_inode2v9ses(dir);		v9ses = v9fs_inode2v9ses(dir);
	dir_dentry = dentry->d_parent;		dir_dentry = dentry->d_parent;
	dfid = v9fs_fid_lookup(dir_dentry);		dfid = v9fs_fid_lookup(dir_dentry);