summaryrefslogtreecommitdiff
path: root/libparted/fs/reiserfs
diff options
context:
space:
mode:
Diffstat (limited to 'libparted/fs/reiserfs')
-rw-r--r--libparted/fs/reiserfs/geom_dal.c38
-rw-r--r--libparted/fs/reiserfs/reiserfs.c18
-rw-r--r--libparted/fs/reiserfs/reiserfs.h2
3 files changed, 29 insertions, 29 deletions
diff --git a/libparted/fs/reiserfs/geom_dal.c b/libparted/fs/reiserfs/geom_dal.c
index 20653f7..3eeb7cc 100644
--- a/libparted/fs/reiserfs/geom_dal.c
+++ b/libparted/fs/reiserfs/geom_dal.c
@@ -27,8 +27,8 @@
static blk_t __len(dal_t *dal) {
PED_ASSERT(dal != NULL, return 0);
-
- return ((PedGeometry *)dal->dev)->length /
+
+ return ((PedGeometry *)dal->dev)->length /
(dal->block_size / PED_SECTOR_SIZE_DEFAULT);
}
@@ -36,13 +36,13 @@ static int __read(dal_t *dal, void *buff, blk_t block, blk_t count) {
blk_t k;
PedSector block_pos;
PedSector block_count;
-
+
PED_ASSERT(dal != NULL, return 0);
-
+
k = dal->block_size / PED_SECTOR_SIZE_DEFAULT;
block_pos = (PedSector)(block * k);
block_count = (PedSector)(count * k);
-
+
return ped_geometry_read((PedGeometry *)dal->dev, buff, block_pos, block_count);
}
@@ -50,14 +50,14 @@ static int __write(dal_t *dal, void *buff, blk_t block, blk_t count) {
blk_t k;
PedSector block_pos;
PedSector block_count;
-
+
PED_ASSERT(dal != NULL, return 0);
-
+
k = dal->block_size / PED_SECTOR_SIZE_DEFAULT;
block_pos = (PedSector)(block * k);
block_count = (PedSector)(count * k);
-
- return ped_geometry_write((PedGeometry *)dal->dev, buff, block_pos,
+
+ return ped_geometry_write((PedGeometry *)dal->dev, buff, block_pos,
block_count);
}
@@ -75,15 +75,15 @@ static int __equals(dal_t *dal1, dal_t *dal2) {
PED_ASSERT(dal1 != NULL, return 0);
PED_ASSERT(dal2 != NULL, return 0);
- return ped_geometry_test_equal((PedGeometry *)dal1->dev,
+ return ped_geometry_test_equal((PedGeometry *)dal1->dev,
(PedGeometry *)dal2->dev);
}
static int __stat(dal_t *dal, struct stat *st) {
-
+
PED_ASSERT(dal != NULL, return 0);
PED_ASSERT(st != NULL, return 0);
-
+
if (stat(((PedGeometry *)dal->dev)->dev->path, st))
return 0;
@@ -92,27 +92,27 @@ static int __stat(dal_t *dal, struct stat *st) {
static dev_t __dev(dal_t *dal) {
struct stat st;
-
+
if (!__stat(dal, &st))
return (dev_t)0;
-
+
return st.st_dev;
}
static struct dal_ops ops = {
- __len, __read, __write, __sync,
+ __len, __read, __write, __sync,
__flags, __equals, __stat, __dev
};
dal_t *geom_dal_create(PedGeometry *geom, size_t block_size, int flags) {
dal_t *dal;
- if (!geom)
+ if (!geom)
return NULL;
-
+
if (!(dal = ped_malloc(sizeof(dal_t))))
return NULL;
-
+
dal->ops = &ops;
dal->dev = geom;
dal->block_size = block_size;
@@ -126,7 +126,7 @@ int geom_dal_reopen(dal_t *dal, int flags) {
if (!dal) return 0;
dal->flags = flags;
-
+
return 1;
}
diff --git a/libparted/fs/reiserfs/reiserfs.c b/libparted/fs/reiserfs/reiserfs.c
index 664f5d8..3468ed9 100644
--- a/libparted/fs/reiserfs/reiserfs.c
+++ b/libparted/fs/reiserfs/reiserfs.c
@@ -265,8 +265,8 @@ static PedFileSystem *reiserfs_open(PedGeometry *geom)
goto error_fs_geom_free;
/*
- We are passing NULL as DAL for journal. Therefore we let libreiserfs know,
- that journal not available and parted will be working fine for reiserfs
+ We are passing NULL as DAL for journal. Therefore we let libreiserfs know,
+ that journal not available and parted will be working fine for reiserfs
with relocated journal too.
*/
if (!(fs = (PedFileSystem *) ped_malloc(sizeof(PedFileSystem))))
@@ -419,14 +419,14 @@ static int reiserfs_check(PedFileSystem *fs, PedTimer *timer)
#ifdef HAVE_REISERFS_FS_CHECK
ped_timer_reset(timer);
-
+
if (libreiserfs_gauge_create && libreiserfs_gauge_free) {
if (!
(gauge =
libreiserfs_gauge_create(NULL, gauge_handler, timer)))
return 0;
}
-
+
ped_timer_set_state_name(timer, _("checking"));
ped_timer_update(timer, 0.0);
@@ -437,13 +437,13 @@ static int reiserfs_check(PedFileSystem *fs, PedTimer *timer)
"Run reiserfsck --check first."));
return 0;
}
-
+
ped_timer_update(timer, 1.0);
if (gauge)
libreiserfs_gauge_free(gauge);
#endif
-
+
ped_exception_throw(PED_EXCEPTION_INFORMATION, PED_EXCEPTION_OK,
_("The reiserfs file system passed a basic check. "
"For a more comprehensive check, run "
@@ -559,9 +559,9 @@ static PedConstraint *reiserfs_get_resize_constraint(const PedFileSystem *
if (!ped_geometry_init(&start_sector, dev, fs->geom->start, 1))
return NULL;
- /*
- Minsize for reiserfs is area occupied by data blocks and
- metadata blocks minus free space blocks and minus bitmap
+ /*
+ Minsize for reiserfs is area occupied by data blocks and
+ metadata blocks minus free space blocks and minus bitmap
blocks which describes free space blocks.
*/
min_size = reiserfs_fs_min_size(fs_info) *
diff --git a/libparted/fs/reiserfs/reiserfs.h b/libparted/fs/reiserfs/reiserfs.h
index 3cd68c0..c10577e 100644
--- a/libparted/fs/reiserfs/reiserfs.h
+++ b/libparted/fs/reiserfs/reiserfs.h
@@ -98,7 +98,7 @@ typedef void * reiserfs_fs_t;
#define JOURNAL_DEF_RATIO 8
#define JOURNAL_MIN_RATIO 2
#define JOURNAL_MAX_BATCH 900
-#define JOURNAL_MAX_COMMIT_AGE 30
+#define JOURNAL_MAX_COMMIT_AGE 30
#define JOURNAL_MAX_TRANS_AGE 30
#define TEA_HASH 1