From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 2/3]: afs: remove manual O_SYNC handling Date: Wed, 30 Sep 2009 22:16:51 +0200 Message-ID: <20090930201651.GC18503@lst.de> References: <20090930201608.GA18503@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-fsdevel@vger.kernel.org, dhowells@redhat.com, dedekind@infradead.org To: jack@suse.cz Return-path: Received: from verein.lst.de ([213.95.11.210]:34008 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752513AbZI3URJ (ORCPT ); Wed, 30 Sep 2009 16:17:09 -0400 Content-Disposition: inline In-Reply-To: <20090930201608.GA18503@lst.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: generic_file_aio_write already calls into ->fsync to handle O_SYNC/O_DSYNC. Remove the duplicate manual invocation. Signed-off-by: Christoph Hellwig Index: linux-2.6/fs/afs/write.c =================================================================== --- linux-2.6.orig/fs/afs/write.c 2009-09-30 13:59:20.550278942 -0300 +++ linux-2.6/fs/afs/write.c 2009-09-30 14:01:32.739005666 -0300 @@ -671,7 +671,6 @@ ssize_t afs_file_write(struct kiocb *ioc struct afs_vnode *vnode = AFS_FS_I(dentry->d_inode); ssize_t result; size_t count = iov_length(iov, nr_segs); - int ret; _enter("{%x.%u},{%zu},%lu,", vnode->fid.vid, vnode->fid.vnode, count, nr_segs); @@ -691,14 +690,6 @@ ssize_t afs_file_write(struct kiocb *ioc return result; } - /* return error values for O_SYNC and IS_SYNC() */ - if (IS_SYNC(&vnode->vfs_inode) || iocb->ki_filp->f_flags & O_DSYNC) { - ret = afs_fsync(iocb->ki_filp, dentry, - (iocb->ki_filp->f_flags & __O_SYNC) ? 0 : 1); - if (ret < 0) - result = ret; - } - _leave(" = %zd", result); return result; }