[PATCH] libf2fs: move the finalize_device() into the io lib.

[PATCH] libf2fs: move the finalize_device() into the io lib.

[JP Abgrall]

This is required so that libf2fs.c can be used against any kind
of device (E.g. an in-memory sparse file) just by linking against
something that provides the libf2fs_io.c functions.

libf2fs is currently libf2fs.c + libf2fs_io.c

Signed-off-by: JP Abgrall <jpa@google.com>
---
 lib/libf2fs.c    | 12 ------------
 lib/libf2fs_io.c | 13 +++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/libf2fs.c b/lib/libf2fs.c
index 8d6c670..6168c5c 100644
--- a/lib/libf2fs.c
+++ b/lib/libf2fs.c
@@ -493,15 +493,3 @@ int f2fs_get_device_info(struct f2fs_configuration *c)
 	return 0;
 }
 
-void f2fs_finalize_device(struct f2fs_configuration *c)
-{
-	/*
-	 * We should call fsync() to flush out all the dirty pages
-	 * in the block device page cache.
-	 */
-	if (fsync(c->fd) < 0)
-		MSG(0, "\tError: Could not conduct fsync!!!\n");
-
-	if (close(c->fd) < 0)
-		MSG(0, "\tError: Failed to close device file!!!\n");
-}
diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c
index 508ccce..5d9b68d 100644
--- a/lib/libf2fs_io.c
+++ b/lib/libf2fs_io.c
@@ -67,3 +67,16 @@ int dev_read_blocks(void *buf, __u64 addr, __u32 nr_blks)
 {
 	return dev_read(buf, addr * F2FS_BLKSIZE, nr_blks * F2FS_BLKSIZE);
 }
+
+void f2fs_finalize_device(struct f2fs_configuration *c)
+{
+	/*
+	 * We should call fsync() to flush out all the dirty pages
+	 * in the block device page cache.
+	 */
+	if (fsync(c->fd) < 0)
+		MSG(0, "\tError: Could not conduct fsync!!!\n");
+
+	if (close(c->fd) < 0)
+		MSG(0, "\tError: Failed to close device file!!!\n");
+}
-- 
2.0.0.526.g5318336


------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems

Re: [PATCH] libf2fs: move the finalize_device() into the io lib.

[Jaegeuk Kim]

On Fri, Jun 13, 2014 at 01:25:20PM -0700, JP Abgrall wrote:
> This is required so that libf2fs.c can be used against any kind
> of device (E.g. an in-memory sparse file) just by linking against
> something that provides the libf2fs_io.c functions.
> 
> libf2fs is currently libf2fs.c + libf2fs_io.c

Ok, merged.
Thanks,

> 
> Signed-off-by: JP Abgrall <jpa@google.com>
> ---
>  lib/libf2fs.c    | 12 ------------
>  lib/libf2fs_io.c | 13 +++++++++++++
>  2 files changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/lib/libf2fs.c b/lib/libf2fs.c
> index 8d6c670..6168c5c 100644
> --- a/lib/libf2fs.c
> +++ b/lib/libf2fs.c
> @@ -493,15 +493,3 @@ int f2fs_get_device_info(struct f2fs_configuration *c)
>  	return 0;
>  }
>  
> -void f2fs_finalize_device(struct f2fs_configuration *c)
> -{
> -	/*
> -	 * We should call fsync() to flush out all the dirty pages
> -	 * in the block device page cache.
> -	 */
> -	if (fsync(c->fd) < 0)
> -		MSG(0, "\tError: Could not conduct fsync!!!\n");
> -
> -	if (close(c->fd) < 0)
> -		MSG(0, "\tError: Failed to close device file!!!\n");
> -}
> diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c
> index 508ccce..5d9b68d 100644
> --- a/lib/libf2fs_io.c
> +++ b/lib/libf2fs_io.c
> @@ -67,3 +67,16 @@ int dev_read_blocks(void *buf, __u64 addr, __u32 nr_blks)
>  {
>  	return dev_read(buf, addr * F2FS_BLKSIZE, nr_blks * F2FS_BLKSIZE);
>  }
> +
> +void f2fs_finalize_device(struct f2fs_configuration *c)
> +{
> +	/*
> +	 * We should call fsync() to flush out all the dirty pages
> +	 * in the block device page cache.
> +	 */
> +	if (fsync(c->fd) < 0)
> +		MSG(0, "\tError: Could not conduct fsync!!!\n");
> +
> +	if (close(c->fd) < 0)
> +		MSG(0, "\tError: Failed to close device file!!!\n");
> +}
> -- 
> 2.0.0.526.g5318336
> 
> 
> ------------------------------------------------------------------------------
> HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
> Find What Matters Most in Your Big Data with HPCC Systems
> Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
> Leverages Graph Analysis for Fast Processing & Easy Data Exploration
> http://p.sf.net/sfu/hpccsystems
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

-- 
Jaegeuk Kim

------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems