Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88d892a3 authored by Yehuda Sadeh's avatar Yehuda Sadeh Committed by Sage Weil
Browse files

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



Signed-off-by: default avatarYehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent a1ea787c

fs/ceph/file.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -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 @@ static ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov, 




		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);