Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 174346
b: refs/heads/master
c: 774888b
h: refs/heads/master
v: v3
  • Loading branch information
Christoph Hellwig authored and Artem Bityutskiy committed Nov 24, 2009
1 parent ef86190 commit f9bad54
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9722324e65a017ea0ce39236a2f87c649bb7c39d
refs/heads/master: 774888bcd646c7055ac69ad4fd0c0fff0827ee39
13 changes: 1 addition & 12 deletions trunk/fs/ubifs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1389,25 +1389,14 @@ static ssize_t ubifs_aio_write(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos)
{
int err;
ssize_t ret;
struct inode *inode = iocb->ki_filp->f_mapping->host;
struct ubifs_info *c = inode->i_sb->s_fs_info;

err = update_mctime(c, inode);
if (err)
return err;

ret = generic_file_aio_write(iocb, iov, nr_segs, pos);
if (ret < 0)
return ret;

if (ret > 0 && (IS_SYNC(inode) || iocb->ki_filp->f_flags & O_SYNC)) {
err = ubifs_sync_wbufs_by_inode(c, inode);
if (err)
return err;
}

return ret;
return generic_file_aio_write(iocb, iov, nr_segs, pos);
}

static int ubifs_set_page_dirty(struct page *page)
Expand Down

0 comments on commit f9bad54

Please sign in to comment.