| commit | b9f985b6e05ebd7af2aaef0eb3ae369390ef191f | [log] [tgz] |
|---|---|---|
| author | Yang Zhang <kthreadd@gmail.com> | Fri Dec 17 08:58:36 2010 +0100 |
| committer | Jens Axboe <jaxboe@fusionio.com> | Fri Dec 17 08:58:36 2010 +0100 |
| tree | 69aa4bd9501f988302a155ebfdc630bd2a37bfde | |
| parent | 7278c9c19bd85cf33213a2e0b538a18d3ac8ad00 [diff] [blame] |
block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p) Signed-off-by: Yang Zhang <kthreadd@gmail.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
diff --git a/block/genhd.c b/block/genhd.c index 5fa2b44..79b9e32 100644 --- a/block/genhd.c +++ b/block/genhd.c
@@ -735,7 +735,7 @@ static void *p; p = disk_seqf_start(seqf, pos); - if (!IS_ERR(p) && p && !*pos) + if (!IS_ERR_OR_NULL(p) && !*pos) seq_puts(seqf, "major minor #blocks name\n\n"); return p; }