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

Commit 08c1ac50 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph, ceph: move ceph_calc_file_object_mapping() to striper.c 



ceph_calc_file_object_mapping() has nothing to do with osdmaps.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent ed0811d2

fs/ceph/addr.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "mds_client.h"

#include "cache.h"

#include <linux/ceph/osd_client.h>

#include <linux/ceph/striper.h>



/*

 * Ceph address space ops.

fs/ceph/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include "super.h"

#include "mds_client.h"

#include "ioctl.h"



#include <linux/ceph/striper.h>



/*

 * ioctls

include/linux/ceph/osdmap.h

+0 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <linux/rbtree.h>

#include <linux/ceph/types.h>

#include <linux/ceph/decode.h>

#include <linux/ceph/ceph_fs.h>

#include <linux/crush/crush.h>



/*
@@ -280,10 +279,6 @@ bool ceph_osds_changed(const struct ceph_osds *old_acting, 
		       const struct ceph_osds *new_acting,

		       bool any_change);



void ceph_calc_file_object_mapping(struct ceph_file_layout *l,

				   u64 off, u64 len,

				   u64 *objno, u64 *objoff, u32 *xlen);



int __ceph_object_locator_to_pg(struct ceph_pg_pool_info *pi,

				const struct ceph_object_id *oid,

				const struct ceph_object_locator *oloc,

include/linux/ceph/striper.h

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ 


struct ceph_file_layout;



void ceph_calc_file_object_mapping(struct ceph_file_layout *l,

				   u64 off, u64 len,

				   u64 *objno, u64 *objoff, u32 *xlen);



struct ceph_object_extent {

	struct list_head oe_item;

	u64 oe_objno;

net/ceph/osd_client.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/ceph/decode.h>

#include <linux/ceph/auth.h>

#include <linux/ceph/pagelist.h>

#include <linux/ceph/striper.h>



#define OSD_OPREPLY_FRONT_LEN	512