diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2002-07-23 17:41:40 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2002-07-23 17:41:40 +0100 |
| commit | 0ae7cf13fb5edee21bf8dd1cecd3e80ac87f7023 (patch) | |
| tree | aedd9ed81196d8fc68b770572ef5e2e49409ec56 | |
| parent | e2aebe41247248bfec1c3affbe7d168518bd5de7 (diff) | |
JFFS2 compile fixes for latest kernel.
| -rw-r--r-- | fs/jffs2/super.c | 6 | ||||
| -rw-r--r-- | include/linux/jffs2_fs_sb.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 95fa3bed8fa8..22bee12f9ecd 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -7,7 +7,7 @@ * * For licensing information, see the file 'LICENCE' in this directory. * - * $Id: super.c,v 1.71 2002/07/23 12:57:38 dwmw2 Exp $ + * $Id: super.c,v 1.72 2002/07/23 14:39:54 dwmw2 Exp $ * */ @@ -77,11 +77,11 @@ static int jffs2_sb_compare(struct super_block *sb, void *data) /* The superblocks are considered to be equivalent if the underlying MTD device is the same one */ if (c->mtd == p->mtd) { - D1(printk(KERN_DEBUG "jffs2_sb_compare: match on device %d (\"%s\")\n", mtd->index, mtd->name)); + D1(printk(KERN_DEBUG "jffs2_sb_compare: match on device %d (\"%s\")\n", p->mtd->index, p->mtd->name)); return 1; } else { D1(printk(KERN_DEBUG "jffs2_sb_compare: No match, device %d (\"%s\"), device %d (\"%s\")\n", - c->mtd->index, c->mtd->name, mtd->index, mtd->name)); + c->mtd->index, c->mtd->name, p->mtd->index, p->mtd->name)); return 0; } } diff --git a/include/linux/jffs2_fs_sb.h b/include/linux/jffs2_fs_sb.h index a215d4e88098..cab82ddbddc5 100644 --- a/include/linux/jffs2_fs_sb.h +++ b/include/linux/jffs2_fs_sb.h @@ -1,10 +1,11 @@ -/* $Id: jffs2_fs_sb.h,v 1.31 2002/07/02 22:48:24 dwmw2 Exp $ */ +/* $Id: jffs2_fs_sb.h,v 1.32 2002/07/23 14:35:34 dwmw2 Exp $ */ #ifndef _JFFS2_FS_SB #define _JFFS2_FS_SB #include <linux/types.h> #include <linux/spinlock.h> +#include <linux/tqueue.h> #include <linux/completion.h> #include <asm/semaphore.h> #include <linux/list.h> |