diff options
| author | Jan Kara <jack@suse.cz> | 2010-10-22 00:30:26 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2011-02-23 11:00:37 +0100 |
| commit | 7e49b6f2480cb9a9e7322a91592e56a5c85361f5 (patch) | |
| tree | 52a4966f5f1a93506a9a6604a9dfd2c390795cf0 /fs/udf/file.c | |
| parent | 4a508dd259f5995b8d31c576b894263f5947d654 (diff) | |
| download | op-kernel-dev-7e49b6f2480cb9a9e7322a91592e56a5c85361f5.zip op-kernel-dev-7e49b6f2480cb9a9e7322a91592e56a5c85361f5.tar.gz | |
udf: Convert UDF to new truncate calling sequence
Use new truncation sequence in UDF and fix up error handling in the
code.
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/file.c')
| -rw-r--r-- | fs/udf/file.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index 89c7848..f391a2a 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -123,8 +123,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 +237,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 +249,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, }; |
