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

Commit 4918b6d1 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: add F_SYNC file flag to force sync (non-O_DIRECT) io 



This allows us to force IO through the sync path which you normally only
get when multiple clients are reading/writing to the same file or by
mounting with -o sync.  Among other things, this lets test programs verify
correctness with a single mount.

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

fs/ceph/file.c

+4 −2
Original line number Diff line number Diff line
@@ -643,7 +643,8 @@ static ssize_t ceph_aio_read(struct kiocb *iocb, const struct iovec *iov, 


	if ((got & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) == 0 ||

	    (iocb->ki_filp->f_flags & O_DIRECT) ||

	    (inode->i_sb->s_flags & MS_SYNCHRONOUS))

	    (inode->i_sb->s_flags & MS_SYNCHRONOUS) ||

	    (fi->flags & CEPH_F_SYNC))

		/* hmm, this isn't really async... */

		ret = ceph_sync_read(filp, base, len, ppos, &checkeof);

	else
@@ -720,7 +721,8 @@ static ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov, 


	if ((got & (CEPH_CAP_FILE_BUFFER|CEPH_CAP_FILE_LAZYIO)) == 0 ||

	    (iocb->ki_filp->f_flags & O_DIRECT) ||

	    (inode->i_sb->s_flags & MS_SYNCHRONOUS)) {

	    (inode->i_sb->s_flags & MS_SYNCHRONOUS) ||

	    (fi->flags & CEPH_F_SYNC)) {

		ret = ceph_sync_write(file, iov->iov_base, iov->iov_len,

			&iocb->ki_pos);

	} else {

fs/ceph/ioctl.c

+11 −0
Original line number Diff line number Diff line
@@ -231,6 +231,14 @@ static long ceph_ioctl_lazyio(struct file *file) 
	return 0;

}



static long ceph_ioctl_syncio(struct file *file)

{

	struct ceph_file_info *fi = file->private_data;



	fi->flags |= CEPH_F_SYNC;

	return 0;

}



long ceph_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	dout("ioctl file %p cmd %u arg %lu\n", file, cmd, arg);
@@ -249,6 +257,9 @@ long ceph_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


	case CEPH_IOC_LAZYIO:

		return ceph_ioctl_lazyio(file);



	case CEPH_IOC_SYNCIO:

		return ceph_ioctl_syncio(file);

	}



	return -ENOTTY;

fs/ceph/ioctl.h

+1 −0
Original line number Diff line number Diff line
@@ -40,5 +40,6 @@ struct ceph_ioctl_dataloc { 
				   struct ceph_ioctl_dataloc)



#define CEPH_IOC_LAZYIO _IO(CEPH_IOCTL_MAGIC, 4)

#define CEPH_IOC_SYNCIO _IO(CEPH_IOCTL_MAGIC, 5)



#endif

fs/ceph/super.h

+2 −0
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ extern void ceph_reservation_status(struct ceph_fs_client *client, 
/*

 * we keep buffered readdir results attached to file->private_data

 */

#define CEPH_F_SYNC     1



struct ceph_file_info {

	short fmode;     /* initialized on open */

	short flags;     /* CEPH_F_* */