Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd (64ba9926) · Commits · 戴 / test

fs/exofs/common.h

+39 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,8 @@
		/* exofs Application specific page/attribute */
		# define EXOFS_APAGE_FS_DATA (OSD_APAGE_APP_DEFINED_FIRST + 3)
		# define EXOFS_ATTR_INODE_DATA 1
		# define EXOFS_ATTR_INODE_FILE_LAYOUT 2
		# define EXOFS_ATTR_INODE_DIR_LAYOUT 3

		/*
		* The maximum number of files we can have is limited by the size of the
		@@ -206,4 +208,41 @@ enum {
		(((name_len) + offsetof(struct exofs_dir_entry, name) + \
		EXOFS_DIR_ROUND) & ~EXOFS_DIR_ROUND)

		/*
		* The on-disk (optional) layout structure.
		* sits in an EXOFS_ATTR_INODE_FILE_LAYOUT or EXOFS_ATTR_INODE_DIR_LAYOUT
		* attribute, attached to any inode, usually to a directory.
		*/

		enum exofs_inode_layout_gen_functions {
		LAYOUT_MOVING_WINDOW = 0,
		LAYOUT_IMPLICT = 1,
		};

		struct exofs_on_disk_inode_layout {
		__le16 gen_func; /* One of enum exofs_inode_layout_gen_functions */
		__le16 pad;
		union {
		/* gen_func == LAYOUT_MOVING_WINDOW (default) */
		struct exofs_layout_sliding_window {
		__le32 num_devices; /* first n devices in global-table*/
		} sliding_window __packed;

		/* gen_func == LAYOUT_IMPLICT */
		struct exofs_layout_implict_list {
		struct exofs_dt_data_map data_map;
		/* Variable array of size data_map.cb_num_comps. These
		* are device indexes of the devices in the global table
		*/
		__le32 dev_indexes[];
		} implict __packed;
		};
		} __packed;

		static inline size_t exofs_on_disk_inode_layout_size(unsigned max_devs)
		{
		return sizeof(struct exofs_on_disk_inode_layout) +
		max_devs * sizeof(__le32);
		}

		#endif /ifndef __EXOFS_COM_H__/

fs/exofs/exofs.h

+44 −9

Original line number	Diff line number	Diff line
		@@ -55,12 +55,28 @@
		/* 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*/

		/* Our way of looking at the data_map */
		unsigned stripe_unit;
		unsigned mirrors_p1;

		unsigned group_width;
		u64 group_depth;
		unsigned group_count;

		enum exofs_inode_layout_gen_functions lay_func;

		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,22 +85,27 @@ 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 */
		};

		/*
		* our extension to the in-memory inode
		*/
		struct exofs_i_info {
		struct inode vfs_inode; /* normal in-memory inode */
		wait_queue_head_t i_wq; /* wait queue for inode */
		unsigned long i_flags; /* various atomic flags */
		uint32_t i_data[EXOFS_IDATA];/short symlink names and device #s/
		uint32_t i_dir_start_lookup; /* which page to start lookup */
		wait_queue_head_t i_wq; /* wait queue for inode */
		uint64_t i_commit_size; /* the object's written length */
		uint8_t i_cred[OSD_CAP_LEN];/* all-powerful credential */
		struct inode vfs_inode; /* normal in-memory inode */
		};

		static inline osd_id exofs_oi_objno(struct exofs_i_info *oi)
		@@ -101,7 +122,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;

		@@ -109,7 +130,11 @@ struct exofs_io_state {
		loff_t offset;
		unsigned long length;
		void *kern_buff;
		struct bio *bio;

		struct page **pages;
		unsigned nr_pages;
		unsigned pgbase;
		unsigned pages_consumed;

		/* Attributes */
		unsigned in_attr_len;
		@@ -122,6 +147,9 @@ struct exofs_io_state {
		struct exofs_per_dev_state {
		struct osd_request *or;
		struct bio *bio;
		loff_t offset;
		unsigned length;
		unsigned dev;
		} per_dev[];
		};

		@@ -174,6 +202,12 @@ static inline struct exofs_i_info exofs_i(struct inode inode)
		return container_of(inode, struct exofs_i_info, vfs_inode);
		}

		/*
		* Given a layout, object_number and stripe_index return the associated global
		* dev_index
		*/
		unsigned exofs_layout_od_id(struct exofs_layout *layout,
		osd_id obj_no, unsigned layout_index);
		/*
		* Maximum count of links to a file
		*/
		@@ -189,7 +223,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

+118 −76

Original line number	Diff line number	Diff line
		@@ -41,16 +41,18 @@

		enum { BIO_MAX_PAGES_KMALLOC =
		(PAGE_SIZE - sizeof(struct bio)) / sizeof(struct bio_vec),
		MAX_PAGES_KMALLOC =
		PAGE_SIZE / sizeof(struct page *),
		};

		struct page_collect {
		struct exofs_sb_info *sbi;
		struct request_queue *req_q;
		struct inode *inode;
		unsigned expected_pages;
		struct exofs_io_state *ios;

		struct bio *bio;
		struct page **pages;
		unsigned alloc_pages;
		unsigned nr_pages;
		unsigned long length;
		loff_t pg_first; /* keep 64bit also in 32-arches */
		@@ -62,15 +64,12 @@ static void _pcol_init(struct page_collect *pcol, unsigned expected_pages,
		struct exofs_sb_info *sbi = inode->i_sb->s_fs_info;

		pcol->sbi = sbi;
		/* 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->inode = inode;
		pcol->expected_pages = expected_pages;

		pcol->ios = NULL;
		pcol->bio = NULL;
		pcol->pages = NULL;
		pcol->alloc_pages = 0;
		pcol->nr_pages = 0;
		pcol->length = 0;
		pcol->pg_first = -1;
		@@ -80,7 +79,8 @@ static void _pcol_reset(struct page_collect *pcol)
		{
		pcol->expected_pages -= min(pcol->nr_pages, pcol->expected_pages);

		pcol->bio = NULL;
		pcol->pages = NULL;
		pcol->alloc_pages = 0;
		pcol->nr_pages = 0;
		pcol->length = 0;
		pcol->pg_first = -1;
		@@ -90,38 +90,43 @@ static void _pcol_reset(struct page_collect *pcol)
		* it might not end here. don't be left with nothing
		*/
		if (!pcol->expected_pages)
		pcol->expected_pages = BIO_MAX_PAGES_KMALLOC;
		pcol->expected_pages = MAX_PAGES_KMALLOC;
		}

		static int pcol_try_alloc(struct page_collect *pcol)
		{
		int pages = min_t(unsigned, pcol->expected_pages,
		BIO_MAX_PAGES_KMALLOC);
		unsigned pages = min_t(unsigned, pcol->expected_pages,
		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;
		}

		/* TODO: easily support bio chaining */
		pages = min_t(unsigned, pages,
		pcol->sbi->layout.group_width * BIO_MAX_PAGES_KMALLOC);

		for (; pages; pages >>= 1) {
		pcol->bio = bio_kmalloc(GFP_KERNEL, pages);
		if (likely(pcol->bio))
		pcol->pages = kmalloc(pages * sizeof(struct page *),
		GFP_KERNEL);
		if (likely(pcol->pages)) {
		pcol->alloc_pages = pages;
		return 0;
		}
		}

		EXOFS_ERR("Failed to bio_kmalloc expected_pages=%u\n",
		EXOFS_ERR("Failed to kmalloc expected_pages=%u\n",
		pcol->expected_pages);
		return -ENOMEM;
		}

		static void pcol_free(struct page_collect *pcol)
		{
		if (pcol->bio) {
		bio_put(pcol->bio);
		pcol->bio = NULL;
		}
		kfree(pcol->pages);
		pcol->pages = NULL;

		if (pcol->ios) {
		exofs_put_io_state(pcol->ios);
		@@ -132,11 +137,10 @@ static void pcol_free(struct page_collect *pcol)
		static int pcol_add_page(struct page_collect pcol, struct page page,
		unsigned len)
		{
		int added_len = bio_add_pc_page(pcol->req_q, pcol->bio, page, len, 0);
		if (unlikely(len != added_len))
		if (unlikely(pcol->nr_pages >= pcol->alloc_pages))
		return -ENOMEM;

		++pcol->nr_pages;
		pcol->pages[pcol->nr_pages++] = page;
		pcol->length += len;
		return 0;
		}
		@@ -181,7 +185,6 @@ static void update_write_page(struct page *page, int ret)
		*/
		static int __readpages_done(struct page_collect *pcol, bool do_unlock)
		{
		struct bio_vec *bvec;
		int i;
		u64 resid;
		u64 good_bytes;
		@@ -193,13 +196,13 @@ static int __readpages_done(struct page_collect *pcol, bool do_unlock)
		else
		good_bytes = pcol->length - resid;

		EXOFS_DBGMSG("readpages_done(0x%lx) good_bytes=0x%llx"
		EXOFS_DBGMSG2("readpages_done(0x%lx) good_bytes=0x%llx"
		" length=0x%lx nr_pages=%u\n",
		pcol->inode->i_ino, _LLU(good_bytes), pcol->length,
		pcol->nr_pages);

		__bio_for_each_segment(bvec, pcol->bio, i, 0) {
		struct page *page = bvec->bv_page;
		for (i = 0; i < pcol->nr_pages; i++) {
		struct page *page = pcol->pages[i];
		struct inode *inode = page->mapping->host;
		int page_stat;

		@@ -218,11 +221,11 @@ static int __readpages_done(struct page_collect *pcol, bool do_unlock)
		ret = update_read_page(page, page_stat);
		if (do_unlock)
		unlock_page(page);
		length += bvec->bv_len;
		length += PAGE_SIZE;
		}

		pcol_free(pcol);
		EXOFS_DBGMSG("readpages_done END\n");
		EXOFS_DBGMSG2("readpages_done END\n");
		return ret;
		}

		@@ -238,11 +241,10 @@ static void readpages_done(struct exofs_io_state ios, void p)

		static void _unlock_pcol_pages(struct page_collect *pcol, int ret, int rw)
		{
		struct bio_vec *bvec;
		int i;

		__bio_for_each_segment(bvec, pcol->bio, i, 0) {
		struct page *page = bvec->bv_page;
		for (i = 0; i < pcol->nr_pages; i++) {
		struct page *page = pcol->pages[i];

		if (rw == READ)
		update_read_page(page, ret);
		@@ -260,13 +262,14 @@ static int read_exec(struct page_collect *pcol, bool is_sync)
		struct page_collect *pcol_copy = NULL;
		int ret;

		if (!pcol->bio)
		if (!pcol->pages)
		return 0;

		/* see comment in _readpage() about sync reads */
		WARN_ON(is_sync && (pcol->nr_pages != 1));

		ios->bio = pcol->bio;
		ios->pages = pcol->pages;
		ios->nr_pages = pcol->nr_pages;
		ios->length = pcol->length;
		ios->offset = pcol->pg_first << PAGE_CACHE_SHIFT;

		@@ -290,7 +293,7 @@ static int read_exec(struct page_collect *pcol, bool is_sync)

		atomic_inc(&pcol->sbi->s_curr_pending);

		EXOFS_DBGMSG("read_exec obj=0x%llx start=0x%llx length=0x%lx\n",
		EXOFS_DBGMSG2("read_exec obj=0x%llx start=0x%llx length=0x%lx\n",
		ios->obj.id, _LLU(ios->offset), pcol->length);

		/* pages ownership was passed to pcol_copy */
		@@ -366,7 +369,7 @@ try_again:
		goto try_again;
		}

		if (!pcol->bio) {
		if (!pcol->pages) {
		ret = pcol_try_alloc(pcol);
		if (unlikely(ret))
		goto fail;
		@@ -448,7 +451,6 @@ static int exofs_readpage(struct file file, struct page page)
		static void writepages_done(struct exofs_io_state ios, void p)
		{
		struct page_collect *pcol = p;
		struct bio_vec *bvec;
		int i;
		u64 resid;
		u64 good_bytes;
		@@ -462,13 +464,13 @@ static void writepages_done(struct exofs_io_state ios, void p)
		else
		good_bytes = pcol->length - resid;

		EXOFS_DBGMSG("writepages_done(0x%lx) good_bytes=0x%llx"
		EXOFS_DBGMSG2("writepages_done(0x%lx) good_bytes=0x%llx"
		" length=0x%lx nr_pages=%u\n",
		pcol->inode->i_ino, _LLU(good_bytes), pcol->length,
		pcol->nr_pages);

		__bio_for_each_segment(bvec, pcol->bio, i, 0) {
		struct page *page = bvec->bv_page;
		for (i = 0; i < pcol->nr_pages; i++) {
		struct page *page = pcol->pages[i];
		struct inode *inode = page->mapping->host;
		int page_stat;

		@@ -485,12 +487,12 @@ static void writepages_done(struct exofs_io_state ios, void p)
		EXOFS_DBGMSG2(" writepages_done(0x%lx, 0x%lx) status=%d\n",
		inode->i_ino, page->index, page_stat);

		length += bvec->bv_len;
		length += PAGE_SIZE;
		}

		pcol_free(pcol);
		kfree(pcol);
		EXOFS_DBGMSG("writepages_done END\n");
		EXOFS_DBGMSG2("writepages_done END\n");
		}

		static int write_exec(struct page_collect *pcol)
		@@ -500,7 +502,7 @@ static int write_exec(struct page_collect *pcol)
		struct page_collect *pcol_copy = NULL;
		int ret;

		if (!pcol->bio)
		if (!pcol->pages)
		return 0;

		pcol_copy = kmalloc(sizeof(*pcol_copy), GFP_KERNEL);
		@@ -512,9 +514,8 @@ static int write_exec(struct page_collect *pcol)

		pcol_copy = pcol;

		pcol_copy->bio->bi_rw \|= (1 << BIO_RW); /* FIXME: bio_set_dir() */

		ios->bio = pcol_copy->bio;
		ios->pages = pcol_copy->pages;
		ios->nr_pages = pcol_copy->nr_pages;
		ios->offset = pcol_copy->pg_first << PAGE_CACHE_SHIFT;
		ios->length = pcol_copy->length;
		ios->done = writepages_done;
		@@ -527,7 +528,7 @@ static int write_exec(struct page_collect *pcol)
		}

		atomic_inc(&pcol->sbi->s_curr_pending);
		EXOFS_DBGMSG("write_exec(0x%lx, 0x%llx) start=0x%llx length=0x%lx\n",
		EXOFS_DBGMSG2("write_exec(0x%lx, 0x%llx) start=0x%llx length=0x%lx\n",
		pcol->inode->i_ino, pcol->pg_first, _LLU(ios->offset),
		pcol->length);
		/* pages ownership was passed to pcol_copy */
		@@ -605,7 +606,7 @@ try_again:
		goto try_again;
		}

		if (!pcol->bio) {
		if (!pcol->pages) {
		ret = pcol_try_alloc(pcol);
		if (unlikely(ret))
		goto fail;
		@@ -616,7 +617,7 @@ try_again:

		ret = pcol_add_page(pcol, page, len);
		if (unlikely(ret)) {
		EXOFS_DBGMSG("Failed pcol_add_page "
		EXOFS_DBGMSG2("Failed pcol_add_page "
		"nr_pages=%u total_length=0x%lx\n",
		pcol->nr_pages, pcol->length);

		@@ -663,7 +664,7 @@ static int exofs_writepages(struct address_space *mapping,
		if (expected_pages < 32L)
		expected_pages = 32L;

		EXOFS_DBGMSG("inode(0x%lx) wbc->start=0x%llx wbc->end=0x%llx "
		EXOFS_DBGMSG2("inode(0x%lx) wbc->start=0x%llx wbc->end=0x%llx "
		"nrpages=%lu start=0x%lx end=0x%lx expected_pages=%ld\n",
		mapping->host->i_ino, wbc->range_start, wbc->range_end,
		mapping->nrpages, start, end, expected_pages);
		@@ -859,20 +860,33 @@ int exofs_setattr(struct dentry dentry, struct iattr iattr)
		return error;
		}

		static const struct osd_attr g_attr_inode_file_layout = ATTR_DEF(
		EXOFS_APAGE_FS_DATA,
		EXOFS_ATTR_INODE_FILE_LAYOUT,
		0);
		static const struct osd_attr g_attr_inode_dir_layout = ATTR_DEF(
		EXOFS_APAGE_FS_DATA,
		EXOFS_ATTR_INODE_DIR_LAYOUT,
		0);

		/*
		* Read an inode from the OSD, and return it as is. We also return the size
		* attribute in the 'obj_size' argument.
		* Read the Linux inode info from the OSD, and return it as is. In exofs the
		* inode info is in an application specific page/attribute of the osd-object.
		*/
		static int exofs_get_inode(struct super_block sb, struct exofs_i_info oi,
		struct exofs_fcb inode, uint64_t obj_size)
		struct exofs_fcb *inode)
		{
		struct exofs_sb_info *sbi = sb->s_fs_info;
		struct osd_attr attrs[2];
		struct osd_attr attrs[] = {
		[0] = g_attr_inode_data,
		[1] = g_attr_inode_file_layout,
		[2] = g_attr_inode_dir_layout,
		};
		struct exofs_io_state *ios;
		struct exofs_on_disk_inode_layout *layout;
		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;
		@@ -882,14 +896,25 @@ static int exofs_get_inode(struct super_block sb, struct exofs_i_info oi,
		exofs_make_credential(oi->i_cred, &ios->obj);
		ios->cred = oi->i_cred;

		attrs[0] = g_attr_inode_data;
		attrs[1] = g_attr_logical_length;
		attrs[1].len = exofs_on_disk_inode_layout_size(sbi->layout.s_numdevs);
		attrs[2].len = exofs_on_disk_inode_layout_size(sbi->layout.s_numdevs);

		ios->in_attr = attrs;
		ios->in_attr_len = ARRAY_SIZE(attrs);

		ret = exofs_sbi_read(ios);
		if (ret)
		if (unlikely(ret)) {
		EXOFS_ERR("object(0x%llx) corrupted, return empty file=>%d\n",
		_LLU(ios->obj.id), ret);
		memset(inode, 0, sizeof(*inode));
		inode->i_mode = 0040000 \| (0777 & ~022);
		/* If object is lost on target we might as well enable it's
		* delete.
		*/
		if ((ret == -ENOENT) \|\| (ret == -EINVAL))
		ret = 0;
		goto out;
		}

		ret = extract_attr_from_ios(ios, &attrs[0]);
		if (ret) {
		@@ -901,11 +926,33 @@ static int exofs_get_inode(struct super_block sb, struct exofs_i_info oi,

		ret = extract_attr_from_ios(ios, &attrs[1]);
		if (ret) {
		EXOFS_ERR("%s: extract_attr of logical_length failed\n",
		__func__);
		EXOFS_ERR("%s: extract_attr of inode_data failed\n", __func__);
		goto out;
		}
		*obj_size = get_unaligned_be64(attrs[1].val_ptr);
		if (attrs[1].len) {
		layout = attrs[1].val_ptr;
		if (layout->gen_func != cpu_to_le16(LAYOUT_MOVING_WINDOW)) {
		EXOFS_ERR("%s: unsupported files layout %d\n",
		__func__, layout->gen_func);
		ret = -ENOTSUPP;
		goto out;
		}
		}

		ret = extract_attr_from_ios(ios, &attrs[2]);
		if (ret) {
		EXOFS_ERR("%s: extract_attr of inode_data failed\n", __func__);
		goto out;
		}
		if (attrs[2].len) {
		layout = attrs[2].val_ptr;
		if (layout->gen_func != cpu_to_le16(LAYOUT_MOVING_WINDOW)) {
		EXOFS_ERR("%s: unsupported meta-data layout %d\n",
		__func__, layout->gen_func);
		ret = -ENOTSUPP;
		goto out;
		}
		}

		out:
		exofs_put_io_state(ios);
		@@ -925,7 +972,6 @@ struct inode exofs_iget(struct super_block sb, unsigned long ino)
		struct exofs_i_info *oi;
		struct exofs_fcb fcb;
		struct inode *inode;
		uint64_t obj_size;
		int ret;

		inode = iget_locked(sb, ino);
		@@ -937,7 +983,7 @@ struct inode exofs_iget(struct super_block sb, unsigned long ino)
		__oi_init(oi);

		/* read the inode from the osd */
		ret = exofs_get_inode(sb, oi, &fcb, &obj_size);
		ret = exofs_get_inode(sb, oi, &fcb);
		if (ret)
		goto bad_inode;

		@@ -958,13 +1004,6 @@ struct inode exofs_iget(struct super_block sb, unsigned long ino)
		inode->i_blkbits = EXOFS_BLKSHIFT;
		inode->i_generation = le32_to_cpu(fcb.i_generation);

		if ((inode->i_size != obj_size) &&
		(!exofs_inode_is_fast_symlink(inode))) {
		EXOFS_ERR("WARNING: Size of inode=%llu != object=%llu\n",
		inode->i_size, _LLU(obj_size));
		/* FIXME: call exofs_inode_recovery() */
		}

		oi->i_dir_start_lookup = 0;

		if ((inode->i_nlink == 0) && (inode->i_mode == 0)) {
		@@ -1043,7 +1082,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 +1143,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);
		@@ -1170,8 +1209,10 @@ static int exofs_update_inode(struct inode *inode, int do_sync)
		int ret;

		args = kzalloc(sizeof(*args), GFP_KERNEL);
		if (!args)
		if (!args) {
		EXOFS_DBGMSG("Faild kzalloc of args\n");
		return -ENOMEM;
		}

		fcb = &args->fcb;

		@@ -1200,7 +1241,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;
		@@ -1234,7 +1275,8 @@ static int exofs_update_inode(struct inode *inode, int do_sync)
		free_args:
		kfree(args);
		out:
		EXOFS_DBGMSG("ret=>%d\n", ret);
		EXOFS_DBGMSG("(0x%lx) do_sync=%d ret=>%d\n",
		inode->i_ino, do_sync, ret);
		return ret;
		}

		@@ -1283,7 +1325,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

+488 −87

File changed.

Preview size limit exceeded, changes collapsed.

fs/exofs/super.c

+90 −31

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;
		@@ -307,6 +308,8 @@ static void exofs_put_super(struct super_block *sb)
		static int _read_and_match_data_map(struct exofs_sb_info *sbi, unsigned numdevs,
		struct exofs_device_table *dt)
		{
		u64 stripe_length;

		sbi->data_map.odm_num_comps =
		le32_to_cpu(dt->dt_data_map.cb_num_comps);
		sbi->data_map.odm_stripe_unit =
		@@ -320,13 +323,62 @@ static int _read_and_match_data_map(struct exofs_sb_info *sbi, unsigned numdevs,
		sbi->data_map.odm_raid_algorithm =
		le32_to_cpu(dt->dt_data_map.cb_raid_algorithm);

		/* FIXME: Hard coded mirror only for now. if not so do not mount */
		if ((sbi->data_map.odm_num_comps != numdevs) \|\|
		(sbi->data_map.odm_stripe_unit != EXOFS_BLKSIZE) \|\|
		(sbi->data_map.odm_raid_algorithm != PNFS_OSD_RAID_0) \|\|
		(sbi->data_map.odm_mirror_cnt != (numdevs - 1)))
		/* FIXME: Only raid0 for now. if not so, do not mount */
		if (sbi->data_map.odm_num_comps != numdevs) {
		EXOFS_ERR("odm_num_comps(%u) != numdevs(%u)\n",
		sbi->data_map.odm_num_comps, numdevs);
		return -EINVAL;
		else
		}
		if (sbi->data_map.odm_raid_algorithm != PNFS_OSD_RAID_0) {
		EXOFS_ERR("Only RAID_0 for now\n");
		return -EINVAL;
		}
		if (0 != (numdevs % (sbi->data_map.odm_mirror_cnt + 1))) {
		EXOFS_ERR("Data Map wrong, numdevs=%d mirrors=%d\n",
		numdevs, sbi->data_map.odm_mirror_cnt);
		return -EINVAL;
		}

		if (0 != (sbi->data_map.odm_stripe_unit & ~PAGE_MASK)) {
		EXOFS_ERR("Stripe Unit(0x%llx)"
		" must be Multples of PAGE_SIZE(0x%lx)\n",
		_LLU(sbi->data_map.odm_stripe_unit), PAGE_SIZE);
		return -EINVAL;
		}

		sbi->layout.stripe_unit = sbi->data_map.odm_stripe_unit;
		sbi->layout.mirrors_p1 = sbi->data_map.odm_mirror_cnt + 1;

		if (sbi->data_map.odm_group_width) {
		sbi->layout.group_width = sbi->data_map.odm_group_width;
		sbi->layout.group_depth = sbi->data_map.odm_group_depth;
		if (!sbi->layout.group_depth) {
		EXOFS_ERR("group_depth == 0 && group_width != 0\n");
		return -EINVAL;
		}
		sbi->layout.group_count = sbi->data_map.odm_num_comps /
		sbi->layout.mirrors_p1 /
		sbi->data_map.odm_group_width;
		} else {
		if (sbi->data_map.odm_group_depth) {
		printk(KERN_NOTICE "Warning: group_depth ignored "
		"group_width == 0 && group_depth == %d\n",
		sbi->data_map.odm_group_depth);
		sbi->data_map.odm_group_depth = 0;
		}
		sbi->layout.group_width = sbi->data_map.odm_num_comps /
		sbi->layout.mirrors_p1;
		sbi->layout.group_depth = -1;
		sbi->layout.group_count = 1;
		}

		stripe_length = (u64)sbi->layout.group_width * sbi->layout.stripe_unit;
		if (stripe_length >= (1ULL << 32)) {
		EXOFS_ERR("Total Stripe length(0x%llx)"
		" >= 32bit is not supported\n", _LLU(stripe_length));
		return -EINVAL;
		}

		return 0;
		}

		@@ -361,7 +413,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 +428,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 +449,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 +480,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 +494,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 +552,15 @@ 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.stripe_unit = PAGE_SIZE;
		sbi->layout.mirrors_p1 = 1;
		sbi->layout.group_width = 1;
		sbi->layout.group_depth = -1;
		sbi->layout.group_count = 1;
		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 +573,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 +637,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 +686,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