diff options
| author | Yaowei Bai <bywxiaobai@163.com> | 2015-11-09 17:58:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-09 18:11:24 -0500 |
| commit | a2a17044094d0816d56a9e151bbf146d89a23010 (patch) | |
| tree | ed90ff4d1370704132fd0fa707772b51a345d2e0 | |
| parent | fdca5e6a6d0a6600ff24d6d9c843e5aee637f29f (diff) | |
fs/jfs: remove unnecessary new_valid_dev() checks
new_valid_dev() always returns 1, so the !new_valid_dev() checks are not
needed. Remove them.
Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/jfs/namei.c | 3 | ||||
| -rw-r--r-- | fs/jfs/super.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 35976bdccafc..9d7551f5c32a 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c | |||
| @@ -1372,9 +1372,6 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry, | |||
| 1372 | tid_t tid; | 1372 | tid_t tid; |
| 1373 | struct tblock *tblk; | 1373 | struct tblock *tblk; |
| 1374 | 1374 | ||
| 1375 | if (!new_valid_dev(rdev)) | ||
| 1376 | return -EINVAL; | ||
| 1377 | |||
| 1378 | jfs_info("jfs_mknod: %pd", dentry); | 1375 | jfs_info("jfs_mknod: %pd", dentry); |
| 1379 | 1376 | ||
| 1380 | rc = dquot_initialize(dir); | 1377 | rc = dquot_initialize(dir); |
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 4cd9798f4948..8f9176caf098 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c | |||
| @@ -496,9 +496,6 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 496 | 496 | ||
| 497 | jfs_info("In jfs_read_super: s_flags=0x%lx", sb->s_flags); | 497 | jfs_info("In jfs_read_super: s_flags=0x%lx", sb->s_flags); |
| 498 | 498 | ||
| 499 | if (!new_valid_dev(sb->s_bdev->bd_dev)) | ||
| 500 | return -EOVERFLOW; | ||
| 501 | |||
| 502 | sbi = kzalloc(sizeof(struct jfs_sb_info), GFP_KERNEL); | 499 | sbi = kzalloc(sizeof(struct jfs_sb_info), GFP_KERNEL); |
| 503 | if (!sbi) | 500 | if (!sbi) |
| 504 | return -ENOMEM; | 501 | return -ENOMEM; |
