From faae1cfe8993113fbd189bc428192c6a039fd255 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 16 Sep 2009 16:57:20 +0200 Subject: [PATCH] devfs: Remove some unneeded variables. --- sys/vfs/devfs/devfs_rules.c | 5 ----- sys/vfs/devfs/devfs_vnops.c | 6 ------ 2 files changed, 11 deletions(-) diff --git a/sys/vfs/devfs/devfs_rules.c b/sys/vfs/devfs/devfs_rules.c index 09aaf81868..82fe51347f 100644 --- a/sys/vfs/devfs/devfs_rules.c +++ b/sys/vfs/devfs/devfs_rules.c @@ -231,7 +231,6 @@ devfs_rule_check_apply(struct devfs_node *node, void *unused) { struct devfs_rule *rule; struct mount *mp = node->mp; - int applies = 0; int locked = 0; /* Check if it is locked already. if not, we acquire the devfs lock */ @@ -297,14 +296,12 @@ devfs_rule_check_apply(struct devfs_node *node, void *unused) continue; } node->flags |= (DEVFS_HIDDEN | DEVFS_RULE_HIDDEN); - applies = 1; } else if (rule->rule_cmd & DEVFS_RULE_SHOW) { /* * Show rule just means that the node should not be hidden, so * what we do is clear the hide flag from the node. */ node->flags &= ~DEVFS_HIDDEN; - applies = 1; } else if (rule->rule_cmd & DEVFS_RULE_LINK) { /* * This is a LINK rule, so we tell devfs to create @@ -314,7 +311,6 @@ devfs_rule_check_apply(struct devfs_node *node, void *unused) #if 0 devfs_alias_create(rule->linkname, node, 1); #endif - applies = 1; } else if (rule->rule_cmd & DEVFS_RULE_PERM) { /* * This is a normal ownership/permission rule. We @@ -324,7 +320,6 @@ devfs_rule_check_apply(struct devfs_node *node, void *unused) node->mode = rule->mode; node->uid = rule->uid; node->gid = rule->gid; - applies = 1; } } diff --git a/sys/vfs/devfs/devfs_vnops.c b/sys/vfs/devfs/devfs_vnops.c index 2526bfa99e..5105ccf574 100644 --- a/sys/vfs/devfs/devfs_vnops.c +++ b/sys/vfs/devfs/devfs_vnops.c @@ -440,7 +440,6 @@ devfs_nresolve(struct vop_nresolve_args *ap) struct vnode *vp = NULL; int error = 0; int len; - int hidden = 0; int depth; ncp = ap->a_nch->ncp; @@ -480,8 +479,6 @@ devfs_nresolve(struct vop_nresolve_args *ap) if (!(found->flags & DEVFS_HIDDEN)) devfs_allocv(/*ap->a_dvp->v_mount, */ &vp, found); - else - hidden = 1; } if (vp == NULL) { @@ -1229,7 +1226,6 @@ devfs_specf_stat(struct file *fp, struct stat *sb, struct ucred *cred) static int devfs_specf_kqfilter(struct file *fp, struct knote *kn) { - struct devfs_node *node; struct vnode *vp; int error; cdev_t dev; @@ -1241,8 +1237,6 @@ devfs_specf_kqfilter(struct file *fp, struct knote *kn) error = EBADF; goto done; } - node = DEVFS_NODE(vp); - if ((dev = vp->v_rdev) == NULL) { error = EBADF; goto done; -- 2.11.4.GIT