]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ocfs2: drop vmtruncate
authorMarco Stornelli <marco.stornelli@gmail.com>
Sat, 15 Dec 2012 10:50:20 +0000 (11:50 +0100)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 20 Dec 2012 19:00:01 +0000 (14:00 -0500)
Removed vmtruncate

Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/ocfs2/file.c

index fe492e1a3cfcaa7189ccdd61075d890673231ceb..37d313ede159bdb457667ceacc18fba18cb3999d 100644 (file)
@@ -1218,24 +1218,6 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
                }
        }
 
-       /*
-        * This will intentionally not wind up calling truncate_setsize(),
-        * since all the work for a size change has been done above.
-        * Otherwise, we could get into problems with truncate as
-        * ip_alloc_sem is used there to protect against i_size
-        * changes.
-        *
-        * XXX: this means the conditional below can probably be removed.
-        */
-       if ((attr->ia_valid & ATTR_SIZE) &&
-           attr->ia_size != i_size_read(inode)) {
-               status = vmtruncate(inode, attr->ia_size);
-               if (status) {
-                       mlog_errno(status);
-                       goto bail_commit;
-               }
-       }
-
        setattr_copy(inode, attr);
        mark_inode_dirty(inode);