From f9bad542a5debdaedf08e5c3e58fd69b65b524a9 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 30 Sep 2009 22:17:16 +0200 Subject: [PATCH] --- yaml --- r: 174346 b: refs/heads/master c: 774888bcd646c7055ac69ad4fd0c0fff0827ee39 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ubifs/file.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index ae267a7b3b93..46f07b69640b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9722324e65a017ea0ce39236a2f87c649bb7c39d +refs/heads/master: 774888bcd646c7055ac69ad4fd0c0fff0827ee39 diff --git a/trunk/fs/ubifs/file.c b/trunk/fs/ubifs/file.c index 1009adc8d602..39849f887e72 100644 --- a/trunk/fs/ubifs/file.c +++ b/trunk/fs/ubifs/file.c @@ -1389,7 +1389,6 @@ 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; @@ -1397,17 +1396,7 @@ static ssize_t ubifs_aio_write(struct kiocb *iocb, const struct iovec *iov, 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)