From 045f2e10bac921e689c7d2a7141f57a98056f5d7 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Thu, 25 Oct 2001 10:37:05 +0000
Subject: [PATCH]  o Fix typos from yesterday

---
 driver/device-mapper/dmfs-error.c | 1 -
 driver/device-mapper/dmfs-table.c | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/driver/device-mapper/dmfs-error.c b/driver/device-mapper/dmfs-error.c
index 1a243da60..9bfb9cbeb 100644
--- a/driver/device-mapper/dmfs-error.c
+++ b/driver/device-mapper/dmfs-error.c
@@ -108,7 +108,6 @@ static ssize_t dmfs_error_read(struct file *file, char *buf, size_t size, loff_t
 {
 	struct inode *inode = file->f_dentry->d_parent->d_inode;
 	struct dmfs_i *dmi = DMFS_I(inode);
-	struct dm_table *t = dmi->table;
 	int copied = 0;
 	loff_t offset = *pos;
 
diff --git a/driver/device-mapper/dmfs-table.c b/driver/device-mapper/dmfs-table.c
index 9747ae3c2..cd0f2a297 100644
--- a/driver/device-mapper/dmfs-table.c
+++ b/driver/device-mapper/dmfs-table.c
@@ -71,7 +71,7 @@ static char *err_table[] = {
 		rv = ttype->ctr(t, start, size, str, &context);
 		msg = context;
 		if (rv == 0) {
-			printk("dmfs_parse: %lu %lu %s %s\n", start, size, 
+			printk("dmfs_parse: %u %u %s %s\n", start, size, 
 				ttype->name,
 				ttype->print ? ttype->print(context) : "-");
 			msg = "Error adding target to table";
@@ -121,6 +121,7 @@ static int dmfs_line_is_not_comment(char *str)
 
 struct dmfs_desc {
 	struct dm_table *table;
+	struct inode *inode;
 	char *tmp;
 	loff_t tmpl;
 	unsigned long lnum;
@@ -151,7 +152,7 @@ static int dmfs_read_actor(read_descriptor_t *desc, struct page *page, unsigned
 			if (dmfs_line_is_not_comment(d->tmp)) {
 				msg = dmfs_parse_line(d->table, d->tmp);
 				if (msg) {
-					dmfs_add_error(t, d->lnum, msg);
+					dmfs_add_error(d->inode, d->lnum, msg);
 				}
 			}
 			d->lnum++;
@@ -191,6 +192,7 @@ static struct dm_table *dmfs_parse(struct inode *inode, struct file *filp)
 			desc.count = inode->i_size;
 			desc.buf = (char *)&d;
 			d.table = t;
+			d.inode = inode;
 			d.tmp = (char *)page;
 			d.tmpl = 0;
 			d.lnum = 1;