exofs: Move layout related members to a layout structure (45d3abcb) · Commits · 戴 / test

fs/exofs/exofs.h

+18 −6

Original line number	Diff line number	Diff line
		@@ -55,12 +55,18 @@
		/* u64 has problems with printk this will cast it to unsigned long long */
		#define _LLU(x) (unsigned long long)(x)

		struct exofs_layout {
		osd_id s_pid; /* partition ID of file system*/

		unsigned s_numdevs; /* Num of devices in array */
		struct osd_dev s_ods[0]; / Variable length */
		};

		/*
		* our extension to the in-memory superblock
		*/
		struct exofs_sb_info {
		struct exofs_fscb s_fscb; /* Written often, pre-allocate*/
		osd_id s_pid; /* partition ID of file system*/
		int s_timeout; /* timeout for OSD operations */
		uint64_t s_nextid; /* highest object ID used */
		uint32_t s_numfiles; /* number of files on fs */
		@@ -69,9 +75,14 @@ struct exofs_sb_info {
		atomic_t s_curr_pending; /* number of pending commands */
		uint8_t s_cred[OSD_CAP_LEN]; /* credential for the fscb */

		struct pnfs_osd_data_map data_map; /* Default raid to use */
		unsigned s_numdevs; /* Num of devices in array */
		struct osd_dev s_ods[1]; / Variable length, minimum 1 */
		struct pnfs_osd_data_map data_map; /* Default raid to use
		* FIXME: Needed ?
		*/
		/* struct exofs_layout dir_layout;/ / Default dir layout */
		struct exofs_layout layout; /* Default files layout,
		* contains the variable osd_dev
		* array. Keep last */
		struct osd_dev _min_one_dev[1]; / Place holder for one dev */
		};

		/*
		@@ -101,7 +112,7 @@ struct exofs_io_state {
		void *private;
		exofs_io_done_fn done;

		struct exofs_sb_info *sbi;
		struct exofs_layout *layout;
		struct osd_obj_id obj;
		u8 *cred;

		@@ -189,7 +200,8 @@ void exofs_make_credential(u8 cred_a[OSD_CAP_LEN],
		int exofs_read_kern(struct osd_dev od, u8 cred, struct osd_obj_id *obj,
		u64 offset, void *p, unsigned length);

		int exofs_get_io_state(struct exofs_sb_info sbi, struct exofs_io_state* ios);
		int exofs_get_io_state(struct exofs_layout *layout,
		struct exofs_io_state **ios);
		void exofs_put_io_state(struct exofs_io_state *ios);

		int exofs_check_io(struct exofs_io_state ios, u64 resid);

fs/exofs/inode.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ static void _pcol_init(struct page_collect *pcol, unsigned expected_pages,
		/* Create master bios on first Q, later on cloning, each clone will be
		* allocated on it's destination Q
		*/
		pcol->req_q = osd_request_queue(sbi->s_ods[0]);
		pcol->req_q = osd_request_queue(sbi->layout.s_ods[0]);
		pcol->inode = inode;
		pcol->expected_pages = expected_pages;

		@@ -99,7 +99,7 @@ static int pcol_try_alloc(struct page_collect *pcol)
		BIO_MAX_PAGES_KMALLOC);

		if (!pcol->ios) { /* First time allocate io_state */
		int ret = exofs_get_io_state(pcol->sbi, &pcol->ios);
		int ret = exofs_get_io_state(&pcol->sbi->layout, &pcol->ios);

		if (ret)
		return ret;
		@@ -872,7 +872,7 @@ static int exofs_get_inode(struct super_block sb, struct exofs_i_info oi,
		int ret;

		*obj_size = ~0;
		ret = exofs_get_io_state(sbi, &ios);
		ret = exofs_get_io_state(&sbi->layout, &ios);
		if (unlikely(ret)) {
		EXOFS_ERR("%s: exofs_get_io_state failed.\n", __func__);
		return ret;
		@@ -1043,7 +1043,7 @@ static void create_done(struct exofs_io_state ios, void p)

		if (unlikely(ret)) {
		EXOFS_ERR("object=0x%llx creation faild in pid=0x%llx",
		_LLU(exofs_oi_objno(oi)), _LLU(sbi->s_pid));
		_LLU(exofs_oi_objno(oi)), _LLU(sbi->layout.s_pid));
		/*TODO: When FS is corrupted creation can fail, object already
		* exist. Get rid of this asynchronous creation, if exist
		* increment the obj counter and try the next object. Until we
		@@ -1104,7 +1104,7 @@ struct inode exofs_new_inode(struct inode dir, int mode)

		mark_inode_dirty(inode);

		ret = exofs_get_io_state(sbi, &ios);
		ret = exofs_get_io_state(&sbi->layout, &ios);
		if (unlikely(ret)) {
		EXOFS_ERR("exofs_new_inode: exofs_get_io_state failed\n");
		return ERR_PTR(ret);
		@@ -1202,7 +1202,7 @@ static int exofs_update_inode(struct inode *inode, int do_sync)
		} else
		memcpy(fcb->i_data, oi->i_data, sizeof(fcb->i_data));

		ret = exofs_get_io_state(sbi, &ios);
		ret = exofs_get_io_state(&sbi->layout, &ios);
		if (unlikely(ret)) {
		EXOFS_ERR("%s: exofs_get_io_state failed.\n", __func__);
		goto free_args;
		@@ -1286,7 +1286,7 @@ void exofs_delete_inode(struct inode *inode)

		clear_inode(inode);

		ret = exofs_get_io_state(sbi, &ios);
		ret = exofs_get_io_state(&sbi->layout, &ios);
		if (unlikely(ret)) {
		EXOFS_ERR("%s: exofs_get_io_state failed\n", __func__);
		return;

fs/exofs/ios.c

+19 −17

Original line number	Diff line number	Diff line
		@@ -67,23 +67,24 @@ out:
		return ret;
		}

		int exofs_get_io_state(struct exofs_sb_info sbi, struct exofs_io_state* pios)
		int exofs_get_io_state(struct exofs_layout *layout,
		struct exofs_io_state **pios)
		{
		struct exofs_io_state *ios;

		/*TODO: Maybe use kmem_cach per sbi of size
		* exofs_io_state_size(sbi->s_numdevs)
		* exofs_io_state_size(layout->s_numdevs)
		*/
		ios = kzalloc(exofs_io_state_size(sbi->s_numdevs), GFP_KERNEL);
		ios = kzalloc(exofs_io_state_size(layout->s_numdevs), GFP_KERNEL);
		if (unlikely(!ios)) {
		EXOFS_DBGMSG("Faild kzalloc bytes=%d\n",
		exofs_io_state_size(sbi->s_numdevs));
		exofs_io_state_size(layout->s_numdevs));
		*pios = NULL;
		return -ENOMEM;
		}

		ios->sbi = sbi;
		ios->obj.partition = sbi->s_pid;
		ios->layout = layout;
		ios->obj.partition = layout->s_pid;
		*pios = ios;
		return 0;
		}
		@@ -238,10 +239,10 @@ int exofs_sbi_create(struct exofs_io_state *ios)
		{
		int i, ret;

		for (i = 0; i < ios->sbi->s_numdevs; i++) {
		for (i = 0; i < ios->layout->s_numdevs; i++) {
		struct osd_request *or;

		or = osd_start_request(ios->sbi->s_ods[i], GFP_KERNEL);
		or = osd_start_request(ios->layout->s_ods[i], GFP_KERNEL);
		if (unlikely(!or)) {
		EXOFS_ERR("%s: osd_start_request failed\n", __func__);
		ret = -ENOMEM;
		@@ -262,10 +263,10 @@ int exofs_sbi_remove(struct exofs_io_state *ios)
		{
		int i, ret;

		for (i = 0; i < ios->sbi->s_numdevs; i++) {
		for (i = 0; i < ios->layout->s_numdevs; i++) {
		struct osd_request *or;

		or = osd_start_request(ios->sbi->s_ods[i], GFP_KERNEL);
		or = osd_start_request(ios->layout->s_ods[i], GFP_KERNEL);
		if (unlikely(!or)) {
		EXOFS_ERR("%s: osd_start_request failed\n", __func__);
		ret = -ENOMEM;
		@@ -286,10 +287,10 @@ int exofs_sbi_write(struct exofs_io_state *ios)
		{
		int i, ret;

		for (i = 0; i < ios->sbi->s_numdevs; i++) {
		for (i = 0; i < ios->layout->s_numdevs; i++) {
		struct osd_request *or;

		or = osd_start_request(ios->sbi->s_ods[i], GFP_KERNEL);
		or = osd_start_request(ios->layout->s_ods[i], GFP_KERNEL);
		if (unlikely(!or)) {
		EXOFS_ERR("%s: osd_start_request failed\n", __func__);
		ret = -ENOMEM;
		@@ -361,8 +362,9 @@ int exofs_sbi_read(struct exofs_io_state *ios)
		struct osd_request *or;
		unsigned first_dev = (unsigned)ios->obj.id;

		first_dev %= ios->sbi->s_numdevs;
		or = osd_start_request(ios->sbi->s_ods[first_dev], GFP_KERNEL);
		first_dev %= ios->layout->s_numdevs;
		or = osd_start_request(ios->layout->s_ods[first_dev],
		GFP_KERNEL);
		if (unlikely(!or)) {
		EXOFS_ERR("%s: osd_start_request failed\n", __func__);
		ret = -ENOMEM;
		@@ -438,7 +440,7 @@ int exofs_oi_truncate(struct exofs_i_info *oi, u64 size)
		__be64 newsize;
		int i, ret;

		if (exofs_get_io_state(sbi, &ios))
		if (exofs_get_io_state(&sbi->layout, &ios))
		return -ENOMEM;

		ios->obj.id = exofs_oi_objno(oi);
		@@ -448,10 +450,10 @@ int exofs_oi_truncate(struct exofs_i_info *oi, u64 size)
		attr = g_attr_logical_length;
		attr.val_ptr = &newsize;

		for (i = 0; i < sbi->s_numdevs; i++) {
		for (i = 0; i < sbi->layout.s_numdevs; i++) {
		struct osd_request *or;

		or = osd_start_request(sbi->s_ods[i], GFP_KERNEL);
		or = osd_start_request(sbi->layout.s_ods[i], GFP_KERNEL);
		if (unlikely(!or)) {
		EXOFS_ERR("%s: osd_start_request failed\n", __func__);
		ret = -ENOMEM;

fs/exofs/super.c

+27 −24

Original line number	Diff line number	Diff line
		@@ -210,7 +210,7 @@ int exofs_sync_fs(struct super_block *sb, int wait)
		sbi = sb->s_fs_info;
		fscb = &sbi->s_fscb;

		ret = exofs_get_io_state(sbi, &ios);
		ret = exofs_get_io_state(&sbi->layout, &ios);
		if (ret)
		goto out;

		@@ -264,12 +264,12 @@ static void _exofs_print_device(const char msg, const char dev_path,

		void exofs_free_sbi(struct exofs_sb_info *sbi)
		{
		while (sbi->s_numdevs) {
		int i = --sbi->s_numdevs;
		struct osd_dev *od = sbi->s_ods[i];
		while (sbi->layout.s_numdevs) {
		int i = --sbi->layout.s_numdevs;
		struct osd_dev *od = sbi->layout.s_ods[i];

		if (od) {
		sbi->s_ods[i] = NULL;
		sbi->layout.s_ods[i] = NULL;
		osduld_put_device(od);
		}
		}
		@@ -298,7 +298,8 @@ static void exofs_put_super(struct super_block *sb)
		msecs_to_jiffies(100));
		}

		_exofs_print_device("Unmounting", NULL, sbi->s_ods[0], sbi->s_pid);
		_exofs_print_device("Unmounting", NULL, sbi->layout.s_ods[0],
		sbi->layout.s_pid);

		exofs_free_sbi(sbi);
		sb->s_fs_info = NULL;
		@@ -361,7 +362,7 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info **psbi,
		{
		struct exofs_sb_info sbi = psbi;
		struct osd_dev *fscb_od;
		struct osd_obj_id obj = {.partition = sbi->s_pid,
		struct osd_obj_id obj = {.partition = sbi->layout.s_pid,
		.id = EXOFS_DEVTABLE_ID};
		struct exofs_device_table *dt;
		unsigned table_bytes = table_count * sizeof(dt->dt_dev_table[0]) +
		@@ -376,9 +377,9 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info **psbi,
		return -ENOMEM;
		}

		fscb_od = sbi->s_ods[0];
		sbi->s_ods[0] = NULL;
		sbi->s_numdevs = 0;
		fscb_od = sbi->layout.s_ods[0];
		sbi->layout.s_ods[0] = NULL;
		sbi->layout.s_numdevs = 0;
		ret = exofs_read_kern(fscb_od, sbi->s_cred, &obj, 0, dt, table_bytes);
		if (unlikely(ret)) {
		EXOFS_ERR("ERROR: reading device table\n");
		@@ -397,14 +398,15 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info **psbi,
		goto out;

		if (likely(numdevs > 1)) {
		unsigned size = numdevs * sizeof(sbi->s_ods[0]);
		unsigned size = numdevs * sizeof(sbi->layout.s_ods[0]);

		sbi = krealloc(sbi, sizeof(*sbi) + size, GFP_KERNEL);
		if (unlikely(!sbi)) {
		ret = -ENOMEM;
		goto out;
		}
		memset(&sbi->s_ods[1], 0, size - sizeof(sbi->s_ods[0]));
		memset(&sbi->layout.s_ods[1], 0,
		size - sizeof(sbi->layout.s_ods[0]));
		*psbi = sbi;
		}

		@@ -427,8 +429,8 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info **psbi,
		* line. We always keep them in device-table order.
		*/
		if (fscb_od && osduld_device_same(fscb_od, &odi)) {
		sbi->s_ods[i] = fscb_od;
		++sbi->s_numdevs;
		sbi->layout.s_ods[i] = fscb_od;
		++sbi->layout.s_numdevs;
		fscb_od = NULL;
		continue;
		}
		@@ -441,8 +443,8 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info **psbi,
		goto out;
		}

		sbi->s_ods[i] = od;
		++sbi->s_numdevs;
		sbi->layout.s_ods[i] = od;
		++sbi->layout.s_numdevs;

		/* Read the fscb of the other devices to make sure the FS
		* partition is there.
		@@ -499,9 +501,10 @@ static int exofs_fill_super(struct super_block sb, void data, int silent)
		goto free_sbi;
		}

		sbi->s_ods[0] = od;
		sbi->s_numdevs = 1;
		sbi->s_pid = opts->pid;
		/* Default layout in case we do not have a device-table */
		sbi->layout.s_ods[0] = od;
		sbi->layout.s_numdevs = 1;
		sbi->layout.s_pid = opts->pid;
		sbi->s_timeout = opts->timeout;

		/* fill in some other data by hand */
		@@ -514,7 +517,7 @@ static int exofs_fill_super(struct super_block sb, void data, int silent)
		sb->s_bdev = NULL;
		sb->s_dev = 0;

		obj.partition = sbi->s_pid;
		obj.partition = sbi->layout.s_pid;
		obj.id = EXOFS_SUPER_ID;
		exofs_make_credential(sbi->s_cred, &obj);

		@@ -578,13 +581,13 @@ static int exofs_fill_super(struct super_block sb, void data, int silent)
		goto free_sbi;
		}

		_exofs_print_device("Mounting", opts->dev_name, sbi->s_ods[0],
		sbi->s_pid);
		_exofs_print_device("Mounting", opts->dev_name, sbi->layout.s_ods[0],
		sbi->layout.s_pid);
		return 0;

		free_sbi:
		EXOFS_ERR("Unable to mount exofs on %s pid=0x%llx err=%d\n",
		opts->dev_name, sbi->s_pid, ret);
		opts->dev_name, sbi->layout.s_pid, ret);
		exofs_free_sbi(sbi);
		return ret;
		}
		@@ -627,7 +630,7 @@ static int exofs_statfs(struct dentry dentry, struct kstatfs buf)
		uint8_t cred_a[OSD_CAP_LEN];
		int ret;

		ret = exofs_get_io_state(sbi, &ios);
		ret = exofs_get_io_state(&sbi->layout, &ios);
		if (ret) {
		EXOFS_DBGMSG("exofs_get_io_state failed.\n");
		return ret;

Admin message