shithub: lwext4

Download patch

ref: dc8bef53210b3d3bf87cf30d8f7dc99536c57414
parent: 7c617245da6163fe5eacab8b7a258c08ac63e075
author: gkostka <[email protected]>
date: Wed Apr 5 15:43:19 EDT 2017 

Rename ext4_filedev to file_dev


--- a/blockdev/linux/ext4_filedev.c
+++ /dev/null
@@ -1,137 +1,0 @@
-/*
- * Copyright (c) 2013 Grzegorz Kostka ([email protected])
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define _LARGEFILE64_SOURCE
-#define _FILE_OFFSET_BITS 64
-
-#include <ext4_config.h>
-#include <ext4_blockdev.h>
-#include <ext4_errno.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-/**@brief   Default filename.*/
-static const char *fname = "ext2";
-
-/**@brief   Image block size.*/
-#define EXT4_FILEDEV_BSIZE 512
-
-/**@brief   Image file descriptor.*/
-static FILE *dev_file;
-
-#define DROP_LINUXCACHE_BUFFERS 0
-
-/**********************BLOCKDEV INTERFACE**************************************/
-static int filedev_open(struct ext4_blockdev *bdev);
-static int filedev_bread(struct ext4_blockdev *bdev, void *buf, uint64_t blk_id,
-			 uint32_t blk_cnt);
-static int filedev_bwrite(struct ext4_blockdev *bdev, const void *buf,
-			  uint64_t blk_id, uint32_t blk_cnt);
-static int filedev_close(struct ext4_blockdev *bdev);
-
-/******************************************************************************/
-EXT4_BLOCKDEV_STATIC_INSTANCE(_filedev, EXT4_FILEDEV_BSIZE, 0, filedev_open,
-		filedev_bread, filedev_bwrite, filedev_close, 0, 0);
-
-/******************************************************************************/
-static int filedev_open(struct ext4_blockdev *bdev)
-{
-	dev_file = fopen(fname, "r+b");
-
-	if (!dev_file)
-		return EIO;
-
-	/*No buffering at file.*/
-	setbuf(dev_file, 0);
-
-	if (fseeko(dev_file, 0, SEEK_END))
-		return EFAULT;
-
-	_filedev.part_offset = 0;
-	_filedev.part_size = ftello(dev_file);
-	_filedev.bdif->ph_bcnt = _filedev.part_size / _filedev.bdif->ph_bsize;
-
-	return EOK;
-}
-
-/******************************************************************************/
-
-static int filedev_bread(struct ext4_blockdev *bdev, void *buf, uint64_t blk_id,
-			 uint32_t blk_cnt)
-{
-	if (fseeko(dev_file, blk_id * bdev->bdif->ph_bsize, SEEK_SET))
-		return EIO;
-	if (!blk_cnt)
-		return EOK;
-	if (!fread(buf, bdev->bdif->ph_bsize * blk_cnt, 1, dev_file))
-		return EIO;
-
-	return EOK;
-}
-
-static void drop_cache(void)
-{
-#if defined(__linux__) && DROP_LINUXCACHE_BUFFERS
-	int fd;
-	char *data = "3";
-
-	sync();
-	fd = open("/proc/sys/vm/drop_caches", O_WRONLY);
-	write(fd, data, sizeof(char));
-	close(fd);
-#endif
-}
-
-/******************************************************************************/
-static int filedev_bwrite(struct ext4_blockdev *bdev, const void *buf,
-			  uint64_t blk_id, uint32_t blk_cnt)
-{
-	if (fseeko(dev_file, blk_id * bdev->bdif->ph_bsize, SEEK_SET))
-		return EIO;
-	if (!blk_cnt)
-		return EOK;
-	if (!fwrite(buf, bdev->bdif->ph_bsize * blk_cnt, 1, dev_file))
-		return EIO;
-
-	drop_cache();
-	return EOK;
-}
-/******************************************************************************/
-static int filedev_close(struct ext4_blockdev *bdev)
-{
-	fclose(dev_file);
-	return EOK;
-}
-
-/******************************************************************************/
-struct ext4_blockdev *ext4_filedev_get(void) { return &_filedev; }
-/******************************************************************************/
-void ext4_filedev_filename(const char *n) { fname = n; }
-
-/******************************************************************************/
--- a/blockdev/linux/ext4_filedev.h
+++ /dev/null
@@ -1,43 +1,0 @@
-/*
- * Copyright (c) 2013 Grzegorz Kostka ([email protected])
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef EXT4_FILEDEV_H_
-#define EXT4_FILEDEV_H_
-
-#include <ext4_config.h>
-#include <ext4_blockdev.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-
-/**@brief   File blockdev get.*/
-struct ext4_blockdev *ext4_filedev_get(void);
-
-/**@brief   Set filename to open.*/
-void ext4_filedev_filename(const char *n);
-
-#endif /* EXT4_FILEDEV_H_ */
--- /dev/null
+++ b/blockdev/linux/file_dev.c
@@ -1,0 +1,142 @@
+/*
+ * Copyright (c) 2013 Grzegorz Kostka ([email protected])
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define _LARGEFILE64_SOURCE
+#define _FILE_OFFSET_BITS 64
+
+#include <ext4_config.h>
+#include <ext4_blockdev.h>
+#include <ext4_errno.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+
+/**@brief   Default filename.*/
+static const char *fname = "ext2";
+
+/**@brief   Image block size.*/
+#define EXT4_FILEDEV_BSIZE 512
+
+/**@brief   Image file descriptor.*/
+static FILE *dev_file;
+
+#define DROP_LINUXCACHE_BUFFERS 0
+
+/**********************BLOCKDEV INTERFACE**************************************/
+static int file_dev_open(struct ext4_blockdev *bdev);
+static int file_dev_bread(struct ext4_blockdev *bdev, void *buf, uint64_t blk_id,
+			 uint32_t blk_cnt);
+static int file_dev_bwrite(struct ext4_blockdev *bdev, const void *buf,
+			  uint64_t blk_id, uint32_t blk_cnt);
+static int file_dev_close(struct ext4_blockdev *bdev);
+
+/******************************************************************************/
+EXT4_BLOCKDEV_STATIC_INSTANCE(file_dev, EXT4_FILEDEV_BSIZE, 0, file_dev_open,
+		file_dev_bread, file_dev_bwrite, file_dev_close, 0, 0);
+
+/******************************************************************************/
+static int file_dev_open(struct ext4_blockdev *bdev)
+{
+	dev_file = fopen(fname, "r+b");
+
+	if (!dev_file)
+		return EIO;
+
+	/*No buffering at file.*/
+	setbuf(dev_file, 0);
+
+	if (fseeko(dev_file, 0, SEEK_END))
+		return EFAULT;
+
+	file_dev.part_offset = 0;
+	file_dev.part_size = ftello(dev_file);
+	file_dev.bdif->ph_bcnt = file_dev.part_size / file_dev.bdif->ph_bsize;
+
+	return EOK;
+}
+
+/******************************************************************************/
+
+static int file_dev_bread(struct ext4_blockdev *bdev, void *buf, uint64_t blk_id,
+			 uint32_t blk_cnt)
+{
+	if (fseeko(dev_file, blk_id * bdev->bdif->ph_bsize, SEEK_SET))
+		return EIO;
+	if (!blk_cnt)
+		return EOK;
+	if (!fread(buf, bdev->bdif->ph_bsize * blk_cnt, 1, dev_file))
+		return EIO;
+
+	return EOK;
+}
+
+static void drop_cache(void)
+{
+#if defined(__linux__) && DROP_LINUXCACHE_BUFFERS
+	int fd;
+	char *data = "3";
+
+	sync();
+	fd = open("/proc/sys/vm/drop_caches", O_WRONLY);
+	write(fd, data, sizeof(char));
+	close(fd);
+#endif
+}
+
+/******************************************************************************/
+static int file_dev_bwrite(struct ext4_blockdev *bdev, const void *buf,
+			  uint64_t blk_id, uint32_t blk_cnt)
+{
+	if (fseeko(dev_file, blk_id * bdev->bdif->ph_bsize, SEEK_SET))
+		return EIO;
+	if (!blk_cnt)
+		return EOK;
+	if (!fwrite(buf, bdev->bdif->ph_bsize * blk_cnt, 1, dev_file))
+		return EIO;
+
+	drop_cache();
+	return EOK;
+}
+/******************************************************************************/
+static int file_dev_close(struct ext4_blockdev *bdev)
+{
+	fclose(dev_file);
+	return EOK;
+}
+
+/******************************************************************************/
+struct ext4_blockdev *file_dev_get(void)
+{
+	return &file_dev;
+}
+/******************************************************************************/
+void file_dev_name_set(const char *n)
+{
+	fname = n;
+}
+/******************************************************************************/
--- /dev/null
+++ b/blockdev/linux/file_dev.h
@@ -1,0 +1,43 @@
+/*
+ * Copyright (c) 2013 Grzegorz Kostka ([email protected])
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef FILE_DEV_H_
+#define FILE_DEV_H_
+
+#include <ext4_config.h>
+#include <ext4_blockdev.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/**@brief   File blockdev get.*/
+struct ext4_blockdev *file_dev_get(void);
+
+/**@brief   Set filename to open.*/
+void file_dev_name_set(const char *n);
+
+#endif /* FILE_DEV_H_ */
--- a/fs_test/lwext4_generic.c
+++ b/fs_test/lwext4_generic.c
@@ -38,7 +38,7 @@
 #include <sys/time.h>
 
 #include <ext4.h>
-#include "../blockdev/linux/ext4_filedev.h"
+#include "../blockdev/linux/file_dev.h"
 #include "../blockdev/windows/file_windows.h"
 #include "common/test_lwext4.h"
 
@@ -118,8 +118,8 @@
 
 static bool open_linux(void)
 {
-	ext4_filedev_filename(input_name);
-	bd = ext4_filedev_get();
+	file_dev_name_set(input_name);
+	bd = file_dev_get();
 	if (!bd) {
 		printf("open_filedev: fail\n");
 		return false;
--- a/fs_test/lwext4_mbr.c
+++ b/fs_test/lwext4_mbr.c
@@ -39,7 +39,7 @@
 
 #include <ext4.h>
 #include <ext4_mbr.h>
-#include "../blockdev/linux/ext4_filedev.h"
+#include "../blockdev/linux/file_dev.h"
 #include "../blockdev/windows/file_windows.h"
 
 /**@brief   Input stream name.*/
@@ -65,8 +65,8 @@
 
 static bool open_linux(void)
 {
-	ext4_filedev_filename(input_name);
-	bd = ext4_filedev_get();
+	file_dev_name_set(input_name);
+	bd = file_dev_get();
 	if (!bd) {
 		printf("open_filedev: fail\n");
 		return false;
--- a/fs_test/lwext4_mkfs.c
+++ b/fs_test/lwext4_mkfs.c
@@ -39,7 +39,7 @@
 
 #include <ext4.h>
 #include <ext4_mkfs.h>
-#include "../blockdev/linux/ext4_filedev.h"
+#include "../blockdev/linux/file_dev.h"
 #include "../blockdev/windows/file_windows.h"
 
 /**@brief   Input stream name.*/
@@ -75,8 +75,8 @@
 
 static bool open_linux(void)
 {
-	ext4_filedev_filename(input_name);
-	bd = ext4_filedev_get();
+	file_dev_name_set(input_name);
+	bd = file_dev_get();
 	if (!bd) {
 		printf("open_filedev: fail\n");
 		return false;
--- a/fs_test/lwext4_server.c
+++ b/fs_test/lwext4_server.c
@@ -49,7 +49,7 @@
 #endif
 
 #include <ext4.h>
-#include "../blockdev/linux/ext4_filedev.h"
+#include "../blockdev/linux/file_dev.h"
 #include "../blockdev/windows/file_windows.h"
 
 
@@ -399,8 +399,8 @@
 	} else
 #endif
 	{
-		ext4_filedev_filename(ext4_fname);
-		bd = ext4_filedev_get();
+		file_dev_name_set(ext4_fname);
+		bd = file_dev_get();
 	}
 
 	ext4_device_unregister_all();