diff options
| author | Yaowei Bai <bywxiaobai@163.com> | 2015-09-29 21:57:33 +0800 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-11-06 23:26:48 +0100 |
| commit | 86ba9ed928f33cf6afbac433ff03dd8c6a0ceac4 (patch) | |
| tree | 693075a3e15930c1eb1293c4eccf8c51cf63f287 | |
| parent | 1cb8f9776c7dcadc57885c6653943511d282633b (diff) | |
| download | linux-stable-86ba9ed928f33cf6afbac433ff03dd8c6a0ceac4.tar.gz linux-stable-86ba9ed928f33cf6afbac433ff03dd8c6a0ceac4.tar.bz2 linux-stable-86ba9ed928f33cf6afbac433ff03dd8c6a0ceac4.zip | |
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>
| -rw-r--r-- | fs/ubifs/dir.c | 3 | ||||
| -rw-r--r-- | 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 5c27c66c224a..1dd9267c165b 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 ee7cb5ebb6e8..8ece6ca58c0b 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->new = cpu_to_le32(new_encode_dev(rdev)); + return sizeof(dev->new); } /** |