From 80a9aaae7f3524c2ef61c62d74b6b9ab0b92f759 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 25 Oct 2011 05:38:41 -0700 Subject: [PATCH] --- yaml --- r: 267029 b: refs/heads/master c: b9e2780d576a010d4aba1e69f247170bf3718d6b h: refs/heads/master i: 267027: f432fbe71ab0d2b6558d94e4ef5100111d8e9277 v: v3 --- [refs] | 2 +- trunk/fs/sysfs/dir.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cd251e9c3ae7..6c232419cb95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9d6329c35869ebf2ff88a5831e8073d3365e8bd +refs/heads/master: b9e2780d576a010d4aba1e69f247170bf3718d6b diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c index 0344ee70a47c..48ffbdf0d017 100644 --- a/trunk/fs/sysfs/dir.c +++ b/trunk/fs/sysfs/dir.c @@ -590,8 +590,8 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd, #undef node } - if (found && ns) { - while (found->s_ns && found->s_ns != ns) { + if (found) { + while (found->s_ns != ns) { p = rb_next(&found->name_node); if (!p) return NULL; @@ -947,7 +947,7 @@ static struct sysfs_dirent *sysfs_dir_pos(const void *ns, #undef node } } - while (pos && pos->s_ns && pos->s_ns != ns) { + while (pos && pos->s_ns != ns) { struct rb_node *p = rb_next(&pos->inode_node); if (!p) pos = NULL; @@ -967,7 +967,7 @@ static struct sysfs_dirent *sysfs_dir_next_pos(const void *ns, pos = NULL; else pos = rb_entry(p, struct sysfs_dirent, inode_node); - } while (pos && pos->s_ns && pos->s_ns != ns); + } while (pos && pos->s_ns != ns); return pos; }