From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754072Ab2HaOJf (ORCPT ); Fri, 31 Aug 2012 10:09:35 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:59790 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753276Ab2HaOJe (ORCPT ); Fri, 31 Aug 2012 10:09:34 -0400 Message-ID: <5040C411.8080207@gmail.com> Date: Fri, 31 Aug 2012 16:02:57 +0200 From: Marco Stornelli User-Agent: Mozilla/5.0 (X11; Linux i686; rv:13.0) Gecko/20120601 Thunderbird/13.0 MIME-Version: 1.0 To: Linux FS Devel CC: Anton Altaparmakov , linux-ntfs-dev@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH 19/21] ntfs: drop vmtruncate Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removed vmtruncate. Signed-off-by: Marco Stornelli --- fs/ntfs/file.c | 8 +++++--- fs/ntfs/inode.c | 11 +++++++++-- fs/ntfs/inode.h | 4 ++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index 1ecf464..5332e90 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c @@ -2022,8 +2022,11 @@ static ssize_t ntfs_file_buffered_write(struct kiocb *iocb, * allocated space, which is not a disaster. */ i_size = i_size_read(vi); - if (pos + bytes > i_size) - vmtruncate(vi, i_size); + if ((pos + bytes > i_size) && + inode_newsize_ok(vi, i_size) == 0) { + truncate_setsize(vi, i_size); + ntfs_truncate_vfs(vi); + } break; } } @@ -2227,7 +2230,6 @@ const struct file_operations ntfs_file_ops = { const struct inode_operations ntfs_file_inode_ops = { #ifdef NTFS_RW - .truncate = ntfs_truncate_vfs, .setattr = ntfs_setattr, #endif /* NTFS_RW */ }; diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index c6dbd3d..fe05a92 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c @@ -2865,9 +2865,11 @@ conv_err_out: * * See ntfs_truncate() description above for details. */ +#ifdef NTFS_RW void ntfs_truncate_vfs(struct inode *vi) { ntfs_truncate(vi); } +#endif /** * ntfs_setattr - called from notify_change() when an attribute is being changed @@ -2913,8 +2915,13 @@ int ntfs_setattr(struct dentry *dentry, struct iattr *attr) NInoCompressed(ni) ? "compressed" : "encrypted"); err = -EOPNOTSUPP; - } else - err = vmtruncate(vi, attr->ia_size); + } else { + err = inode_newsize_ok(vi, attr->ia_size); + if (!err) { + truncate_setsize(vi, attr->ia_size); + ntfs_truncate_vfs(vi); + } + } if (err || ia_valid == ATTR_SIZE) goto out; } else { diff --git a/fs/ntfs/inode.h b/fs/ntfs/inode.h index db29695..76b6cfb 100644 --- a/fs/ntfs/inode.h +++ b/fs/ntfs/inode.h @@ -316,6 +316,10 @@ static inline void ntfs_commit_inode(struct inode *vi) return; } +#else + +static inline void ntfs_truncate_vfs(struct inode *vi) {} + #endif /* NTFS_RW */ #endif /* _LINUX_NTFS_INODE_H */ -- 1.7.3.4