git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
mtd
/
devices
/
blkmtd.c
diff --git
a/drivers/mtd/devices/blkmtd.c
b/drivers/mtd/devices/blkmtd.c
index
662e807
..
04f864d
100644
(file)
--- a/
drivers/mtd/devices/blkmtd.c
+++ b/
drivers/mtd/devices/blkmtd.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: blkmtd.c,v 1.2
4 2004/11/16 18:29:01 dwmw2
Exp $
+ * $Id: blkmtd.c,v 1.2
7 2005/11/07 11:14:24 gleixner
Exp $
*
* blkmtd.c - use a block device as a fake MTD
*
*
* blkmtd.c - use a block device as a fake MTD
*
@@
-39,7
+39,7
@@
/* Default erase size in K, always make it a multiple of PAGE_SIZE */
#define CONFIG_MTD_BLKDEV_ERASESIZE (128 << 10) /* 128KiB */
/* Default erase size in K, always make it a multiple of PAGE_SIZE */
#define CONFIG_MTD_BLKDEV_ERASESIZE (128 << 10) /* 128KiB */
-#define VERSION "$Revision: 1.2
4
$"
+#define VERSION "$Revision: 1.2
7
$"
/* Info for the block device */
struct blkmtd_dev {
/* Info for the block device */
struct blkmtd_dev {
@@
-113,11
+113,11
@@
static int bi_write_complete(struct bio *bio, unsigned int bytes_done, int error
ClearPageUptodate(page);
SetPageError(page);
}
ClearPageUptodate(page);
SetPageError(page);
}
-
ClearPageD
irty(page);
+
clear_page_d
irty(page);
unlock_page(page);
page_cache_release(page);
} while (bvec >= bio->bi_io_vec);
unlock_page(page);
page_cache_release(page);
} while (bvec >= bio->bi_io_vec);
-
+
complete((struct completion*)bio->bi_private);
return 0;
}
complete((struct completion*)bio->bi_private);
return 0;
}
@@
-135,7
+135,7
@@
static int blkmtd_readpage(struct blkmtd_dev *dev, struct page *page)
unlock_page(page);
return 0;
}
unlock_page(page);
return 0;
}
-
+
ClearPageUptodate(page);
ClearPageError(page);
ClearPageUptodate(page);
ClearPageError(page);
@@
-289,7
+289,7
@@
static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
BUG();
}
memcpy(page_address(page)+offset, buf, start_len);
BUG();
}
memcpy(page_address(page)+offset, buf, start_len);
-
SetPageD
irty(page);
+
set_page_d
irty(page);
SetPageUptodate(page);
buf += start_len;
thislen = start_len;
SetPageUptodate(page);
buf += start_len;
thislen = start_len;
@@
-336,7
+336,7
@@
static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
}
pagenr++;
pagecnt--;
}
pagenr++;
pagecnt--;
-
SetPageD
irty(page);
+
set_page_d
irty(page);
SetPageUptodate(page);
pagesc--;
thislen += PAGE_SIZE;
SetPageUptodate(page);
pagesc--;
thislen += PAGE_SIZE;
@@
-357,7
+357,7
@@
static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
BUG();
}
memcpy(page_address(page), buf, end_len);
BUG();
}
memcpy(page_address(page), buf, end_len);
-
SetPageD
irty(page);
+
set_page_d
irty(page);
SetPageUptodate(page);
DEBUG(3, "blkmtd: write: writing out partial end\n");
thislen += end_len;
SetPageUptodate(page);
DEBUG(3, "blkmtd: write: writing out partial end\n");
thislen += end_len;
@@
-539,11
+539,8
@@
static void free_device(struct blkmtd_dev *dev)
{
DEBUG(2, "blkmtd: free_device() dev = %p\n", dev);
if(dev) {
{
DEBUG(2, "blkmtd: free_device() dev = %p\n", dev);
if(dev) {
- if(dev->mtd_info.eraseregions)
- kfree(dev->mtd_info.eraseregions);
- if(dev->mtd_info.name)
- kfree(dev->mtd_info.name);
-
+ kfree(dev->mtd_info.eraseregions);
+ kfree(dev->mtd_info.name);
if(dev->blkdev) {
invalidate_inode_pages(dev->blkdev->bd_inode->i_mapping);
close_bdev_excl(dev->blkdev);
if(dev->blkdev) {
invalidate_inode_pages(dev->blkdev->bd_inode->i_mapping);
close_bdev_excl(dev->blkdev);
@@
-710,7
+707,7
@@
static struct blkmtd_dev *add_device(char *devname, int readonly, int erase_size
dev->mtd_info.erasesize >> 10,
readonly ? "(read-only)" : "");
}
dev->mtd_info.erasesize >> 10,
readonly ? "(read-only)" : "");
}
-
+
return dev;
devinit_err:
return dev;
devinit_err: