diff options
Diffstat (limited to 'fs/ubifs/file.c')
| -rw-r--r-- | fs/ubifs/file.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 8565e586e533..4071d1cae29f 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c | |||
| @@ -890,7 +890,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode, | |||
| 890 | loff_t new_size = attr->ia_size; | 890 | loff_t new_size = attr->ia_size; |
| 891 | struct ubifs_inode *ui = ubifs_inode(inode); | 891 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 892 | struct ubifs_budget_req req = { .dirtied_ino = 1, | 892 | struct ubifs_budget_req req = { .dirtied_ino = 1, |
| 893 | .dirtied_ino_d = ui->data_len }; | 893 | .dirtied_ino_d = ALIGN(ui->data_len, 8) }; |
| 894 | 894 | ||
| 895 | err = ubifs_budget_space(c, &req); | 895 | err = ubifs_budget_space(c, &req); |
| 896 | if (err) | 896 | if (err) |
| @@ -941,7 +941,8 @@ int ubifs_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 941 | struct inode *inode = dentry->d_inode; | 941 | struct inode *inode = dentry->d_inode; |
| 942 | struct ubifs_info *c = inode->i_sb->s_fs_info; | 942 | struct ubifs_info *c = inode->i_sb->s_fs_info; |
| 943 | 943 | ||
| 944 | dbg_gen("ino %lu, ia_valid %#x", inode->i_ino, attr->ia_valid); | 944 | dbg_gen("ino %lu, mode %#x, ia_valid %#x", |
| 945 | inode->i_ino, inode->i_mode, attr->ia_valid); | ||
| 945 | err = inode_change_ok(inode, attr); | 946 | err = inode_change_ok(inode, attr); |
| 946 | if (err) | 947 | if (err) |
| 947 | return err; | 948 | return err; |
| @@ -1051,7 +1052,7 @@ static int update_mctime(struct ubifs_info *c, struct inode *inode) | |||
| 1051 | if (mctime_update_needed(inode, &now)) { | 1052 | if (mctime_update_needed(inode, &now)) { |
| 1052 | int err, release; | 1053 | int err, release; |
| 1053 | struct ubifs_budget_req req = { .dirtied_ino = 1, | 1054 | struct ubifs_budget_req req = { .dirtied_ino = 1, |
| 1054 | .dirtied_ino_d = ui->data_len }; | 1055 | .dirtied_ino_d = ALIGN(ui->data_len, 8) }; |
| 1055 | 1056 | ||
| 1056 | err = ubifs_budget_space(c, &req); | 1057 | err = ubifs_budget_space(c, &req); |
| 1057 | if (err) | 1058 | if (err) |
| @@ -1270,6 +1271,7 @@ struct file_operations ubifs_file_operations = { | |||
| 1270 | .fsync = ubifs_fsync, | 1271 | .fsync = ubifs_fsync, |
| 1271 | .unlocked_ioctl = ubifs_ioctl, | 1272 | .unlocked_ioctl = ubifs_ioctl, |
| 1272 | .splice_read = generic_file_splice_read, | 1273 | .splice_read = generic_file_splice_read, |
| 1274 | .splice_write = generic_file_splice_write, | ||
| 1273 | #ifdef CONFIG_COMPAT | 1275 | #ifdef CONFIG_COMPAT |
| 1274 | .compat_ioctl = ubifs_compat_ioctl, | 1276 | .compat_ioctl = ubifs_compat_ioctl, |
| 1275 | #endif | 1277 | #endif |
