aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/balloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/balloc.c')
-rw-r--r--fs/ext4/balloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 357e4e50374a..e9e98449137b 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -14,9 +14,9 @@
14#include <linux/time.h> 14#include <linux/time.h>
15#include <linux/capability.h> 15#include <linux/capability.h>
16#include <linux/fs.h> 16#include <linux/fs.h>
17#include <linux/jbd.h> 17#include <linux/jbd2.h>
18#include <linux/ext4_fs.h> 18#include <linux/ext4_fs.h>
19#include <linux/ext4_jbd.h> 19#include <linux/ext4_jbd2.h>
20#include <linux/quotaops.h> 20#include <linux/quotaops.h>
21#include <linux/buffer_head.h> 21#include <linux/buffer_head.h>
22 22
@@ -526,12 +526,12 @@ do_more:
526 * transaction. 526 * transaction.
527 * 527 *
528 * Ideally we would want to allow that to happen, but to 528 * Ideally we would want to allow that to happen, but to
529 * do so requires making journal_forget() capable of 529 * do so requires making jbd2_journal_forget() capable of
530 * revoking the queued write of a data block, which 530 * revoking the queued write of a data block, which
531 * implies blocking on the journal lock. *forget() 531 * implies blocking on the journal lock. *forget()
532 * cannot block due to truncate races. 532 * cannot block due to truncate races.
533 * 533 *
534 * Eventually we can fix this by making journal_forget() 534 * Eventually we can fix this by making jbd2_journal_forget()
535 * return a status indicating whether or not it was able 535 * return a status indicating whether or not it was able
536 * to revoke the buffer. On successful revoke, it is 536 * to revoke the buffer. On successful revoke, it is
537 * safe not to set the allocation bit in the committed 537 * safe not to set the allocation bit in the committed
@@ -1382,7 +1382,7 @@ int ext4_should_retry_alloc(struct super_block *sb, int *retries)
1382 1382
1383 jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id); 1383 jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
1384 1384
1385 return journal_force_commit_nested(EXT4_SB(sb)->s_journal); 1385 return jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal);
1386} 1386}
1387 1387
1388/** 1388/**