diff options
| author | Jaegeuk Kim <jaegeuk@google.com> | 2017-02-04 14:45:59 +0800 |
|---|---|---|
| committer | Jin Qian <jinqian@google.com> | 2017-06-26 17:52:02 +0000 |
| commit | ddd7ebd6e6a7c2f6b499cab08c1fac230edb920b (patch) | |
| tree | b60dd0c3dbd2f975359db68d7eb2952c422f2547 /lib | |
| parent | 15dcc016f9b674a71e2a25466d8835e5255fef86 (diff) | |
| download | android_external_f2fs-tools-ddd7ebd6e6a7c2f6b499cab08c1fac230edb920b.tar.gz android_external_f2fs-tools-ddd7ebd6e6a7c2f6b499cab08c1fac230edb920b.tar.bz2 android_external_f2fs-tools-ddd7ebd6e6a7c2f6b499cab08c1fac230edb920b.zip | |
f2fs-tools: merge -next changes
Changes include:
mkfs.f2fs: drop initial spaces for feature string
f2fs-tools: avoid build warnings
(origin/dev, dev) mkfs.f2fs: avoid wrong discard of dnode
f2fs-tools: fix the wrong message when errno is EBUSY
f2fs-tools: support to set and recognize CP_TRIMMED_FLAG
fsck.f2fs: sanity check segno and blk_off when building curseg array
fsck.f2fs: sanity check cp_payload before reading checkpoint
fsck.f2fs: sanity check blk_off for summary block entries
mkfs.f2fs: fix wrong segment assignment
f2fs-tools: sanity check segment count
fsck.f2fs: fix cur_valid_map buffer overflow
Fix mkfs out of tree builds
mkfs.f2fs: use noheap by default
libf2fs: avoid overwrite the c.start_sector by non-root device
...
Change-Id: I27adc30ff4439e5b3f7a290d81a3a783bf916d4a
Merged-In: I27adc30ff4439e5b3f7a290d81a3a783bf916d4a
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libf2fs.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/libf2fs.c b/lib/libf2fs.c index 93d3da9..c96506a 100644 --- a/lib/libf2fs.c +++ b/lib/libf2fs.c @@ -568,9 +568,10 @@ void f2fs_init_configuration(void) c.segs_per_sec = 1; c.secs_per_zone = 1; c.segs_per_zone = 1; - c.heap = 1; + c.heap = 0; c.vol_label = ""; c.trim = 1; + c.trimmed = 0; c.ro = 0; c.kd = -1; } @@ -730,10 +731,12 @@ int get_device_info(int i) #endif dev->total_sectors /= dev->sector_size; - if (ioctl(fd, HDIO_GETGEO, &geom) < 0) - c.start_sector = 0; - else - c.start_sector = geom.start; + if (i == 0) { + if (ioctl(fd, HDIO_GETGEO, &geom) < 0) + c.start_sector = 0; + else + c.start_sector = geom.start; + } #ifndef WITH_ANDROID /* Send INQUIRY command */ |