Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block

[pandora-kernel.git] / fs / udf / file.c

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 94e4553..2a346bb 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -122,8 +122,8 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                if (inode->i_sb->s_blocksize <
                                (udf_file_entry_alloc_offset(inode) +
                                                pos + count)) {
-                       udf_expand_file_adinicb(inode, pos + count, &err);
-                       if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
+                       err = udf_expand_file_adinicb(inode);
+                       if (err) {
                                udf_debug("udf_expand_adinicb: err=%d\n", err);
                                up_write(&iinfo->i_data_sem);
                                return err;
@@ -236,7 +236,7 @@ static int udf_setattr(struct dentry *dentry, struct iattr *attr)
 
        if ((attr->ia_valid & ATTR_SIZE) &&
            attr->ia_size != i_size_read(inode)) {
-               error = vmtruncate(inode, attr->ia_size);
+               error = udf_setsize(inode, attr->ia_size);
                if (error)
                        return error;
        }
@@ -248,5 +248,4 @@ static int udf_setattr(struct dentry *dentry, struct iattr *attr)
 
 const struct inode_operations udf_file_inode_operations = {
        .setattr                = udf_setattr,
-       .truncate               = udf_truncate,
 };