Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: don't call jbd2_journal_force_commit_nested without journal
ext4: Reorder fs/Makefile so that ext2 root fs's are mounted using ext2
ext4: Remove duplicate call to ext4_commit_super() in ext4_freeze()
+8
-5
+4
-2
fs/Makefile
+4
-2
fs/Makefile
···
69
69
# Do not add any filesystems before this line
70
70
obj-$(CONFIG_REISERFS_FS) += reiserfs/
71
71
obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3
72
-
obj-$(CONFIG_EXT4_FS) += ext4/ # Before ext2 so root fs can be ext4
72
+
obj-$(CONFIG_EXT2_FS) += ext2/
73
+
# We place ext4 after ext2 so plain ext2 root fs's are mounted using ext2
74
+
# unless explicitly requested by rootfstype
75
+
obj-$(CONFIG_EXT4_FS) += ext4/
73
76
obj-$(CONFIG_JBD) += jbd/
74
77
obj-$(CONFIG_JBD2) += jbd2/
75
-
obj-$(CONFIG_EXT2_FS) += ext2/
76
78
obj-$(CONFIG_CRAMFS) += cramfs/
77
79
obj-$(CONFIG_SQUASHFS) += squashfs/
78
80
obj-y += ramfs/
+3
-1
fs/ext4/balloc.c
+3
-1
fs/ext4/balloc.c
···
609
609
*/
610
610
int ext4_should_retry_alloc(struct super_block *sb, int *retries)
611
611
{
612
-
if (!ext4_has_free_blocks(EXT4_SB(sb), 1) || (*retries)++ > 3)
612
+
if (!ext4_has_free_blocks(EXT4_SB(sb), 1) ||
613
+
(*retries)++ > 3 ||
614
+
!EXT4_SB(sb)->s_journal)
613
615
return 0;
614
616
615
617
jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
+1
-1
fs/ext4/inode.c
+1
-1
fs/ext4/inode.c
-1
fs/ext4/super.c
-1
fs/ext4/super.c
···
3091
3091
3092
3092
/* Journal blocked and flushed, clear needs_recovery flag. */
3093
3093
EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
3094
-
ext4_commit_super(sb, EXT4_SB(sb)->s_es, 1);
3095
3094
error = ext4_commit_super(sb, EXT4_SB(sb)->s_es, 1);
3096
3095
if (error)
3097
3096
goto out;