diff options
Diffstat (limited to 'fs/udf/file.c')
| -rw-r--r-- | fs/udf/file.c | 8 | 
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index 89c78486cbbe..2a346bb1d9f5 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -98,7 +98,6 @@ static int udf_adinicb_write_end(struct file *file,  const struct address_space_operations udf_adinicb_aops = {  	.readpage	= udf_adinicb_readpage,  	.writepage	= udf_adinicb_writepage, -	.sync_page	= block_sync_page,  	.write_begin = simple_write_begin,  	.write_end = udf_adinicb_write_end,  }; @@ -123,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; @@ -237,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;  	} @@ -249,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,  };  | 
