X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fext4%2Ffsync.c;h=8d50879d1c2c68f23284314ff4fc7c5afe3c0a8e;hb=69450bb5eb8e9df28281c62f98e971c9969dc4ff;hp=272faa27761d9c188bd0281439e51a458b070950;hpb=617ba13b31fbf505cc21799826639ef24ed94af0;p=linux-2.6

diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 272faa2776..8d50879d1c 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -26,9 +26,9 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/writeback.h>
-#include <linux/jbd.h>
+#include <linux/jbd2.h>
 #include <linux/ext4_fs.h>
-#include <linux/ext4_jbd.h>
+#include <linux/ext4_jbd2.h>
 
 /*
  * akpm: A new design for ext4_sync_file().
@@ -47,7 +47,7 @@ int ext4_sync_file(struct file * file, struct dentry *dentry, int datasync)
 	struct inode *inode = dentry->d_inode;
 	int ret = 0;
 
-	J_ASSERT(ext4_journal_current_handle() == 0);
+	J_ASSERT(ext4_journal_current_handle() == NULL);
 
 	/*
 	 * data=writeback: