[gparted] Make check_repair_filesystem() skip mounted file systems (#775932)
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Make check_repair_filesystem() skip mounted file systems (#775932)
- Date: Wed, 14 Dec 2016 21:12:37 +0000 (UTC)
commit 84acec3f91f7822114894301099fcac1d51ddd86
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Mon Nov 14 20:21:55 2016 +0000
Make check_repair_filesystem() skip mounted file systems (#775932)
Make the logic at the check_repair_filesystem() call sites a little
easier by not having to avoid calling it for online file systems. The
function handles that itself as a silent non-operation.
Bug 775932 - Refactor mostly applying of operations
src/GParted_Core.cc | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 40f0dcc..db4545b 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -2518,14 +2518,14 @@ bool GParted_Core::resize( const Partition & partition_old,
Sector delta = partition_new.get_sector_length() - partition_old.get_sector_length();
if ( delta < 0LL ) // shrink
{
- success = ( partition_new.busy || check_repair_filesystem( partition_new, operationdetail
) )
+ success = check_repair_filesystem( partition_new, operationdetail )
&& resize_filesystem( partition_old, partition_new, operationdetail )
&& ( partition_new.whole_device ||
resize_move_partition( partition_old, partition_new, operationdetail ) );
}
else if ( delta > 0LL ) // grow
{
- success = ( partition_new.busy || check_repair_filesystem( partition_new, operationdetail
) )
+ success = check_repair_filesystem( partition_new, operationdetail )
&& ( partition_new.whole_device ||
resize_move_partition( partition_old, partition_new, operationdetail ) )
&& maximize_filesystem( partition_new, operationdetail );
@@ -3101,6 +3101,10 @@ void GParted_Core::rollback_transaction( const Partition & partition_src,
bool GParted_Core::check_repair_filesystem( const Partition & partition, OperationDetail & operationdetail )
{
+ if ( partition.busy )
+ // Trying to check an online file system is a successful non-operation.
+ return true;
+
operationdetail .add_child( OperationDetail(
String::ucompose(
/* TO TRANSLATORS: looks like check file system on
/dev/sda5 for errors and (if possible) fix them */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]