UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ceph: don't clobber write return value when using O_SYNC 

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Yehuda Sadeh 2010-02-23 18:16:23 +00:00 committed by Sage Weil
parent a1ea787c7b
commit 88d892a37f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/ceph/file.c
View File

@ -807,7 +807,7 @@ static ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov,
struct ceph_osd_client *osdc = &ceph_client(inode->i_sb)->osdc; struct ceph_osd_client *osdc = &ceph_client(inode->i_sb)->osdc;
loff_t endoff = pos + iov->iov_len; loff_t endoff = pos + iov->iov_len;
int got = 0; int got = 0;
int ret; int ret, err;
if (ceph_snap(inode) != CEPH_NOSNAP) if (ceph_snap(inode) != CEPH_NOSNAP)
return -EROFS; return -EROFS;
@ -838,9 +838,12 @@ retry_snap:
if ((ret >= 0 || ret == -EIOCBQUEUED) && if ((ret >= 0 || ret == -EIOCBQUEUED) &&
((file->f_flags & O_SYNC) || IS_SYNC(file->f_mapping->host) ((file->f_flags & O_SYNC) || IS_SYNC(file->f_mapping->host)
|| ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_NEARFULL))) || ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_NEARFULL))) {
ret = vfs_fsync_range(file, file->f_path.dentry, err = vfs_fsync_range(file, file->f_path.dentry,
pos, pos + ret - 1, 1); pos, pos + ret - 1, 1);
if (err < 0)
ret = err;
}
} }
if (ret >= 0) { if (ret >= 0) {
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);