diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-11-16 00:30:57 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-11-16 00:30:57 -0500 |
| commit | 4486af5b4c1b117ac88a92cd2336cb41c15107d3 (patch) | |
| tree | 0f9f282be5d654bc2679b05072af3e7eb5035463 /resize | |
| parent | 054e5a9ccf8d65e015f2af85bfddd3fda3a0472f (diff) | |
| parent | 5827d2412d0774cb6294521a0ea578975fed07ce (diff) | |
| download | e2fsprogs-4486af5b4c1b117ac88a92cd2336cb41c15107d3.tar.gz | |
Merge branch 'maint' into next
Conflicts:
misc/mke2fs.c
Diffstat (limited to 'resize')
| -rw-r--r-- | resize/resize2fs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/resize/resize2fs.c b/resize/resize2fs.c index b1e1e47b..19844429 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -1880,6 +1880,10 @@ static errcode_t fix_sb_journal_backup(ext2_filsys fs) if (!(fs->super->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL)) return 0; + /* External journal? Nothing to do. */ + if (fs->super->s_journal_dev && !fs->super->s_journal_inum) + return 0; + retval = ext2fs_read_inode(fs, fs->super->s_journal_inum, &inode); if (retval) return retval; |