Skip to content

Commit

Permalink
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/jack/linux-udf-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  UDF: Fix compiler warning
  udf: Convert UDF to new truncate calling sequence
  • Loading branch information
torvalds committed Mar 18, 2011
2 parents 978ca16 + 6f644e5 commit 374e552
Show file tree
Hide file tree
Showing 5 changed files with 236 additions and 172 deletions.
4 changes: 2 additions & 2 deletions fs/udf/balloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define udf_set_bit(nr, addr) ext2_set_bit(nr, addr)
#define udf_test_bit(nr, addr) ext2_test_bit(nr, addr)
#define udf_find_next_one_bit(addr, size, offset) \
ext2_find_next_bit(addr, size, offset)
ext2_find_next_bit((unsigned long *)(addr), size, offset)

static int read_block_bitmap(struct super_block *sb,
struct udf_bitmap *bitmap, unsigned int block,
Expand Down Expand Up @@ -297,7 +297,7 @@ static int udf_bitmap_new_block(struct super_block *sb,
break;
}
} else {
bit = udf_find_next_one_bit((char *)bh->b_data,
bit = udf_find_next_one_bit(bh->b_data,
sb->s_blocksize << 3,
group_start << 3);
if (bit < sb->s_blocksize << 3)
Expand Down
7 changes: 3 additions & 4 deletions fs/udf/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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,
};
Loading

0 comments on commit 374e552

Please sign in to comment.