iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ntfs: drop vmtruncate

Browse Source 
Removed vmtruncate

Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Reviewed-by: Anton Altaparmakov <anton@tuxera.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Marco Stornelli 2012-12-15 11:58:36 +01:00 committed by Al Viro
parent 2d1b399b22
commit 9014da7525
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/ntfs/file.c
View File

@ -1762,6 +1762,16 @@ err_out:
return err; return err;
} }
static void ntfs_write_failed(struct address_space *mapping, loff_t to)
{
struct inode *inode = mapping->host;
if (to > inode->i_size) {
truncate_pagecache(inode, to, inode->i_size);
ntfs_truncate_vfs(inode);
}
}
/** /**
* ntfs_file_buffered_write - * ntfs_file_buffered_write -
* *
@ -2022,8 +2032,9 @@ static ssize_t ntfs_file_buffered_write(struct kiocb *iocb,
* allocated space, which is not a disaster. * allocated space, which is not a disaster.
*/ */
i_size = i_size_read(vi); i_size = i_size_read(vi);
if (pos + bytes > i_size) if (pos + bytes > i_size) {
vmtruncate(vi, i_size); ntfs_write_failed(mapping, pos + bytes);
}
break; break;
} }
} }
@ -2227,7 +2238,6 @@ const struct file_operations ntfs_file_ops = {
const struct inode_operations ntfs_file_inode_ops = { const struct inode_operations ntfs_file_inode_ops = {
#ifdef NTFS_RW #ifdef NTFS_RW
.truncate = ntfs_truncate_vfs,
.setattr = ntfs_setattr, .setattr = ntfs_setattr,
#endif /* NTFS_RW */ #endif /* NTFS_RW */
}; };

8
fs/ntfs/inode.c
View File

@ -2866,9 +2866,11 @@ conv_err_out:
* *
* See ntfs_truncate() description above for details. * See ntfs_truncate() description above for details.
*/ */
#ifdef NTFS_RW
void ntfs_truncate_vfs(struct inode *vi) { void ntfs_truncate_vfs(struct inode *vi) {
ntfs_truncate(vi); ntfs_truncate(vi);
} }
#endif
/** /**
* ntfs_setattr - called from notify_change() when an attribute is being changed * ntfs_setattr - called from notify_change() when an attribute is being changed
@ -2914,8 +2916,10 @@ int ntfs_setattr(struct dentry *dentry, struct iattr *attr)
NInoCompressed(ni) ? NInoCompressed(ni) ?
"compressed" : "encrypted"); "compressed" : "encrypted");
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
} else } else {
err = vmtruncate(vi, attr->ia_size); truncate_setsize(vi, attr->ia_size);
ntfs_truncate_vfs(vi);
}
if (err || ia_valid == ATTR_SIZE) if (err || ia_valid == ATTR_SIZE)
goto out; goto out;
} else { } else {

4
fs/ntfs/inode.h
View File

@ -316,6 +316,10 @@ static inline void ntfs_commit_inode(struct inode *vi)
return; return;
} }
#else
static inline void ntfs_truncate_vfs(struct inode *vi) {}
#endif /* NTFS_RW */ #endif /* NTFS_RW */
#endif /* _LINUX_NTFS_INODE_H */ #endif /* _LINUX_NTFS_INODE_H */