btrfs: merge save_error_info helpers into one

kdave · Josef Bacik · commit bbece8a3f00a · 2013-05-06T15:52:55.000-04:00
Signed-off-by: David Sterba &lt;dsterba@suse.cz&gt;
Signed-off-by: Josef Bacik &lt;jbacik@fusionio.com&gt;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
@@ -92,7 +92,7 @@ static const char *btrfs_decode_error(int errno, char nbuf[16])
 	return errstr;
 }
 
-static void __save_error_info(struct btrfs_fs_info *fs_info)
+static void save_error_info(struct btrfs_fs_info *fs_info)
 {
 	/*
 	 * today we only save the error info into ram.  Long term we'll
@@ -101,11 +101,6 @@ static void __save_error_info(struct btrfs_fs_info *fs_info)
 	set_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state);
 }
 
-static void save_error_info(struct btrfs_fs_info *fs_info)
-{
-	__save_error_info(fs_info);
-}
-
 /* btrfs handle error by forcing the filesystem readonly */
 static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
 {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ static const char *btrfs_decode_error(int errno, char nbuf[16])`
`92`	`92`	`return errstr;`
`93`	`93`	`}`
`94`	`94`
`95`		`-static void __save_error_info(struct btrfs_fs_info *fs_info)`
	`95`	`+static void save_error_info(struct btrfs_fs_info *fs_info)`
`96`	`96`	`{`
`97`	`97`	`/*`
`98`	`98`	`* today we only save the error info into ram. Long term we'll`
`@@ -101,11 +101,6 @@ static void __save_error_info(struct btrfs_fs_info *fs_info)`
`101`	`101`	`set_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state);`
`102`	`102`	`}`
`103`	`103`
`104`		`-static void save_error_info(struct btrfs_fs_info *fs_info)`
`105`		`-{`
`106`		`- __save_error_info(fs_info);`
`107`		`-}`
`108`		`-`
`109`	`104`	`/* btrfs handle error by forcing the filesystem readonly */`
`110`	`105`	`static void btrfs_handle_error(struct btrfs_fs_info *fs_info)`
`111`	`106`	`{`