diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-05 04:44:40 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-05 04:44:40 +0200 |
commit | 24f0eed2668b059e847ff145848ddacb75419acc (patch) | |
tree | 010c89c06e191b068f8a078b10bfaf1d3699c834 /fs/block_dev.c | |
parent | Merge branch 'fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/l... (diff) | |
parent | RCUify freeing acls, let check_acl() go ahead in RCU mode if acl is cached (diff) | |
download | linux-24f0eed2668b059e847ff145848ddacb75419acc.tar.xz linux-24f0eed2668b059e847ff145848ddacb75419acc.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
RCUify freeing acls, let check_acl() go ahead in RCU mode if acl is cached
get rid of boilerplate switches in posix_acl.h
fix block device fallout from ->fsync() changes
Diffstat (limited to '')
-rw-r--r-- | fs/block_dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index f28680553288..ff77262e887c 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -387,6 +387,10 @@ int blkdev_fsync(struct file *filp, loff_t start, loff_t end, int datasync) struct inode *bd_inode = filp->f_mapping->host; struct block_device *bdev = I_BDEV(bd_inode); int error; + + error = filemap_write_and_wait_range(filp->f_mapping, start, end); + if (error) + return error; /* * There is no need to serialise calls to blkdev_issue_flush with |