|
@@ -98,9 +98,6 @@ static int ntfs_file_open(struct inode *vi, struct file *filp)
|
|
* the page at all. For a more detailed explanation see ntfs_truncate() in
|
|
* the page at all. For a more detailed explanation see ntfs_truncate() in
|
|
* fs/ntfs/inode.c.
|
|
* fs/ntfs/inode.c.
|
|
*
|
|
*
|
|
- * @cached_page and @lru_pvec are just optimizations for dealing with multiple
|
|
|
|
- * pages.
|
|
|
|
- *
|
|
|
|
* Return 0 on success and -errno on error. In the case that an error is
|
|
* Return 0 on success and -errno on error. In the case that an error is
|
|
* encountered it is possible that the initialized size will already have been
|
|
* encountered it is possible that the initialized size will already have been
|
|
* incremented some way towards @new_init_size but it is guaranteed that if
|
|
* incremented some way towards @new_init_size but it is guaranteed that if
|
|
@@ -110,8 +107,7 @@ static int ntfs_file_open(struct inode *vi, struct file *filp)
|
|
* Locking: i_mutex on the vfs inode corrseponsind to the ntfs inode @ni must be
|
|
* Locking: i_mutex on the vfs inode corrseponsind to the ntfs inode @ni must be
|
|
* held by the caller.
|
|
* held by the caller.
|
|
*/
|
|
*/
|
|
-static int ntfs_attr_extend_initialized(ntfs_inode *ni, const s64 new_init_size,
|
|
|
|
- struct page **cached_page, struct pagevec *lru_pvec)
|
|
|
|
|
|
+static int ntfs_attr_extend_initialized(ntfs_inode *ni, const s64 new_init_size)
|
|
{
|
|
{
|
|
s64 old_init_size;
|
|
s64 old_init_size;
|
|
loff_t old_i_size;
|
|
loff_t old_i_size;
|
|
@@ -1925,8 +1921,7 @@ static ssize_t ntfs_file_buffered_write(struct kiocb *iocb,
|
|
ll = ni->initialized_size;
|
|
ll = ni->initialized_size;
|
|
read_unlock_irqrestore(&ni->size_lock, flags);
|
|
read_unlock_irqrestore(&ni->size_lock, flags);
|
|
if (pos > ll) {
|
|
if (pos > ll) {
|
|
- err = ntfs_attr_extend_initialized(ni, pos, &cached_page,
|
|
|
|
- &lru_pvec);
|
|
|
|
|
|
+ err = ntfs_attr_extend_initialized(ni, pos);
|
|
if (err < 0) {
|
|
if (err < 0) {
|
|
ntfs_error(vol->sb, "Cannot perform write to inode "
|
|
ntfs_error(vol->sb, "Cannot perform write to inode "
|
|
"0x%lx, attribute type 0x%x, because "
|
|
"0x%lx, attribute type 0x%x, because "
|