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

Commit f0b18d9f authored by Sage Weil's avatar Sage Weil
Browse files

ceph: sync header defs with server code 



Define ROLLBACK op, IFLOCK inode lock (for advisory file locking).

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 5cd068c2

fs/ceph/ceph_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ extern const char *ceph_mds_state_name(int s); 
#define CEPH_LOCK_IDFT        512   /* dir frag tree */

#define CEPH_LOCK_INEST       1024  /* mds internal */

#define CEPH_LOCK_IXATTR      2048

#define CEPH_LOCK_IFLOCK      4096  /* advisory file locks */

#define CEPH_LOCK_INO         8192  /* immutable inode bits; not a lock */



/* client_session ops */

fs/ceph/ceph_strings.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ const char *ceph_osd_op_name(int op) 
	case CEPH_OSD_OP_TRUNCATE: return "truncate";

	case CEPH_OSD_OP_ZERO: return "zero";

	case CEPH_OSD_OP_WRITEFULL: return "writefull";

	case CEPH_OSD_OP_ROLLBACK: return "rollback";



	case CEPH_OSD_OP_APPEND: return "append";

	case CEPH_OSD_OP_STARTSYNC: return "startsync";

fs/ceph/rados.h

+9 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ enum { 
	CEPH_OSD_OP_TMAPGET = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 12,



	CEPH_OSD_OP_CREATE  = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 13,

	CEPH_OSD_OP_ROLLBACK= CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 14,



	/** attrs **/

	/* read */
@@ -272,6 +273,10 @@ static inline int ceph_osd_op_mode_modify(int op) 
	return (op & CEPH_OSD_OP_MODE) == CEPH_OSD_OP_MODE_WR;

}



/*

 * note that the following tmap stuff is also defined in the ceph librados.h

 * any modification here needs to be updated there

 */

#define CEPH_OSD_TMAP_HDR 'h'

#define CEPH_OSD_TMAP_SET 's'

#define CEPH_OSD_TMAP_RM  'r'
@@ -297,6 +302,7 @@ enum { 
	CEPH_OSD_FLAG_PARALLELEXEC = 512, /* execute op in parallel */

	CEPH_OSD_FLAG_PGOP = 1024,      /* pg op, no object */

	CEPH_OSD_FLAG_EXEC = 2048,      /* op may exec */

	CEPH_OSD_FLAG_EXEC_PUBLIC = 4096, /* op may exec (public) */

};



enum {
@@ -350,6 +356,9 @@ struct ceph_osd_op { 
		struct {

			__le64 cookie, count;

		} __attribute__ ((packed)) pgls;

	        struct {

		        __le64 snapid;

	        } __attribute__ ((packed)) snap;

	};

	__le32 payload_len;

} __attribute__ ((packed));