diff options
author | Christoph Hellwig <hch@lst.de> | 2009-09-30 16:16:51 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2009-12-10 09:02:50 -0500 |
commit | 027cf316afff03d310281709314fbc0899984759 (patch) | |
tree | 48e28adeb9f4690b7db70fdc3ce97bddb0f35a42 /fs/afs/write.c | |
parent | 94004ed726f38a841cc51f97c4a3f9eda9fbd0d9 (diff) |
afs: remove manual O_SYNC handling
generic_file_aio_write already calls into ->fsync to handle O_SYNC/O_DSYNC.
Remove the duplicate manual invocation.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/afs/write.c')
-rw-r--r-- | fs/afs/write.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c index 6be1bc31616a..5e15a21dbf9f 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c | |||
@@ -671,7 +671,6 @@ ssize_t afs_file_write(struct kiocb *iocb, const struct iovec *iov, | |||
671 | struct afs_vnode *vnode = AFS_FS_I(dentry->d_inode); | 671 | struct afs_vnode *vnode = AFS_FS_I(dentry->d_inode); |
672 | ssize_t result; | 672 | ssize_t result; |
673 | size_t count = iov_length(iov, nr_segs); | 673 | size_t count = iov_length(iov, nr_segs); |
674 | int ret; | ||
675 | 674 | ||
676 | _enter("{%x.%u},{%zu},%lu,", | 675 | _enter("{%x.%u},{%zu},%lu,", |
677 | vnode->fid.vid, vnode->fid.vnode, count, nr_segs); | 676 | vnode->fid.vid, vnode->fid.vnode, count, nr_segs); |
@@ -691,14 +690,6 @@ ssize_t afs_file_write(struct kiocb *iocb, const struct iovec *iov, | |||
691 | return result; | 690 | return result; |
692 | } | 691 | } |
693 | 692 | ||
694 | /* return error values for O_SYNC and IS_SYNC() */ | ||
695 | if (IS_SYNC(&vnode->vfs_inode) || iocb->ki_filp->f_flags & O_DSYNC) { | ||
696 | ret = afs_fsync(iocb->ki_filp, dentry, | ||
697 | (iocb->ki_filp->f_flags & __O_SYNC) ? 0 : 1); | ||
698 | if (ret < 0) | ||
699 | result = ret; | ||
700 | } | ||
701 | |||
702 | _leave(" = %zd", result); | 693 | _leave(" = %zd", result); |
703 | return result; | 694 | return result; |
704 | } | 695 | } |