Commit f775ff7d authored by Alexander Graf's avatar Alexander Graf Committed by Ilya Dryomov
Browse files

ceph: fix file open flags on ppc64 



The file open flags (O_foo) are platform specific and should never go
out to an interface that is not local to the system.

Unfortunately these flags have leaked out onto the wire in the cephfs
implementation. That lead to bogus flags getting transmitted on ppc64.

This patch converts the kernel view of flags to the ceph view of file
open flags.

Fixes: 124e68e7 ("ceph: file operations")
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent b50c2de5

fs/ceph/file.c

+33 −1
Original line number Diff line number Diff line
@@ -13,6 +13,38 @@ 
#include "mds_client.h"

#include "cache.h"



static __le32 ceph_flags_sys2wire(u32 flags)

{

	u32 wire_flags = 0;



	switch (flags & O_ACCMODE) {

	case O_RDONLY:

		wire_flags |= CEPH_O_RDONLY;

		break;

	case O_WRONLY:

		wire_flags |= CEPH_O_WRONLY;

		break;

	case O_RDWR:

		wire_flags |= CEPH_O_RDWR;

		break;

	}



#define ceph_sys2wire(a) if (flags & a) { wire_flags |= CEPH_##a; flags &= ~a; }



	ceph_sys2wire(O_CREAT);

	ceph_sys2wire(O_EXCL);

	ceph_sys2wire(O_TRUNC);

	ceph_sys2wire(O_DIRECTORY);

	ceph_sys2wire(O_NOFOLLOW);



#undef ceph_sys2wire



	if (flags)

		dout("unused open flags: %x", flags);



	return cpu_to_le32(wire_flags);

}



/*

 * Ceph file operations

 *
@@ -123,7 +155,7 @@ prepare_open_request(struct super_block *sb, int flags, int create_mode) 
	if (IS_ERR(req))

		goto out;

	req->r_fmode = ceph_flags_to_mode(flags);

	req->r_args.open.flags = cpu_to_le32(flags);

	req->r_args.open.flags = ceph_flags_sys2wire(flags);

	req->r_args.open.mode = cpu_to_le32(create_mode);

out:

	return req;

include/linux/ceph/ceph_fs.h

+12 −0
Original line number Diff line number Diff line
@@ -367,6 +367,18 @@ extern const char *ceph_mds_op_name(int op); 
#define CEPH_READDIR_HASH_ORDER		(1<<9)

#define CEPH_READDIR_OFFSET_HASH	(1<<10)



/*

 * open request flags

 */

#define CEPH_O_RDONLY		00000000

#define CEPH_O_WRONLY		00000001

#define CEPH_O_RDWR		00000002

#define CEPH_O_CREAT		00000100

#define CEPH_O_EXCL		00000200

#define CEPH_O_TRUNC		00001000

#define CEPH_O_DIRECTORY	00200000

#define CEPH_O_NOFOLLOW		00400000



union ceph_mds_request_args {

	struct {

		__le32 mask;                 /* CEPH_CAP_* */

CRA Git | Maintained and supported by SUSTech CRA and CCSE