OSDN Git Service
(root)
/
android-x86
/
external-e2fsprogs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb47b94
66457fc
)
Merge branch 'maint' into next
author
Theodore Ts'o
<tytso@mit.edu>
Sun, 15 Dec 2013 01:56:29 +0000
(20:56 -0500)
committer
Theodore Ts'o
<tytso@mit.edu>
Sun, 15 Dec 2013 01:56:29 +0000
(20:56 -0500)
Conflicts:
misc/tune2fs.c
1
2
misc/tune2fs.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
misc/tune2fs.c
index
1ae0ee6
,
a8dc111
..
a84e6d6
---
1
/
misc/tune2fs.c
---
2
/
misc/tune2fs.c
+++ b/
misc/tune2fs.c
@@@
-2653,8
-2154,8
+2653,7
@@@
retry_open
int set_csum = 0;
dgrp_t i;
- if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
- EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
- if (sb->s_feature_ro_compat &
- EXT4_FEATURE_RO_COMPAT_GDT_CSUM) {
++ if (ext2fs_has_group_desc_csum(fs)) {
/*
* Changing the UUID requires rewriting all metadata,
* which can race with a mounted fs. Don't allow that.