Merge with 2.1.56 as first part of merging back my code.

1 files changed, 7 insertions, 2 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index f42026ac2..dbb9d14dc 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -287,7 +287,12 @@ long block_read(struct inode * inode, struct file * filp,
 	return read;
 }
 
-int block_fsync(struct inode *inode, struct file *filp)
+/*
+ *	Filp may be NULL when we are called by an msync of a vma
+ *	since the vma has no handle.
+ */
+ 
+int block_fsync(struct file *filp, struct dentry *dentry)
 {
-	return fsync_dev (inode->i_rdev);
+	return fsync_dev(dentry->d_inode->i_rdev);
 }