diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-03-22 12:32:25 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-05-21 18:31:21 -0400 |
| commit | 8018ab057480974e7f26a387bf4ce040e9a5f6f1 (patch) | |
| tree | 98298180bf60797a028eca4f24234dc67d38a9d4 /drivers | |
| parent | e970a573ce30a3976234dcfb67906c164b0df9ee (diff) | |
sanitize vfs_fsync calling conventions
Now that the last user passing a NULL file pointer is gone we can remove
the redundant dentry argument and associated hacks inside vfs_fsynmc_range.
The next step will be removig the dentry argument from ->fsync, but given
the luck with the last round of method prototype changes I'd rather
defer this until after the main merge window.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/loop.c | 4 | ||||
| -rw-r--r-- | drivers/md/bitmap.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/storage_common.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index a90e83c9be96..6120922f459f 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
| @@ -485,7 +485,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) | |||
| 485 | goto out; | 485 | goto out; |
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | ret = vfs_fsync(file, file->f_path.dentry, 0); | 488 | ret = vfs_fsync(file, 0); |
| 489 | if (unlikely(ret)) { | 489 | if (unlikely(ret)) { |
| 490 | ret = -EIO; | 490 | ret = -EIO; |
| 491 | goto out; | 491 | goto out; |
| @@ -495,7 +495,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) | |||
| 495 | ret = lo_send(lo, bio, pos); | 495 | ret = lo_send(lo, bio, pos); |
| 496 | 496 | ||
| 497 | if (barrier && !ret) { | 497 | if (barrier && !ret) { |
| 498 | ret = vfs_fsync(file, file->f_path.dentry, 0); | 498 | ret = vfs_fsync(file, 0); |
| 499 | if (unlikely(ret)) | 499 | if (unlikely(ret)) |
| 500 | ret = -EIO; | 500 | ret = -EIO; |
| 501 | } | 501 | } |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index f084249295d9..53e8bea295e2 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
| @@ -1692,7 +1692,7 @@ int bitmap_create(mddev_t *mddev) | |||
| 1692 | * and bypass the page cache, we must sync the file | 1692 | * and bypass the page cache, we must sync the file |
| 1693 | * first. | 1693 | * first. |
| 1694 | */ | 1694 | */ |
| 1695 | vfs_fsync(file, file->f_dentry, 1); | 1695 | vfs_fsync(file, 1); |
| 1696 | } | 1696 | } |
| 1697 | /* read superblock from bitmap file (this sets mddev->bitmap_info.chunksize) */ | 1697 | /* read superblock from bitmap file (this sets mddev->bitmap_info.chunksize) */ |
| 1698 | if (!mddev->bitmap_info.external) | 1698 | if (!mddev->bitmap_info.external) |
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 868d8ee86756..04c462ff0ea6 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c | |||
| @@ -654,7 +654,7 @@ static int fsg_lun_fsync_sub(struct fsg_lun *curlun) | |||
| 654 | 654 | ||
| 655 | if (curlun->ro || !filp) | 655 | if (curlun->ro || !filp) |
| 656 | return 0; | 656 | return 0; |
| 657 | return vfs_fsync(filp, filp->f_path.dentry, 1); | 657 | return vfs_fsync(filp, 1); |
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | static void store_cdrom_address(u8 *dest, int msf, u32 addr) | 660 | static void store_cdrom_address(u8 *dest, int msf, u32 addr) |
