diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
tree | 5861a45f70c1f283720337abd864498f5afb3dbe /fs/afs/write.c | |
parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'fs/afs/write.c')
-rw-r--r-- | fs/afs/write.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c index c63a3c8beb73..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,13 +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_SYNC) { | ||
696 | ret = afs_fsync(iocb->ki_filp, dentry, 1); | ||
697 | if (ret < 0) | ||
698 | result = ret; | ||
699 | } | ||
700 | |||
701 | _leave(" = %zd", result); | 693 | _leave(" = %zd", result); |
702 | return result; | 694 | return result; |
703 | } | 695 | } |