Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

* 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: Fix groups code when num_devices is not divisible by group_width exofs: Remove useless optimization exofs: exofs_file_fsync and exofs_file_flush correctness exofs: Remove superfluous dependency on buffer_head and writeback

Linus Torvalds committed 16 years ago

Commit bf25db32 parents 682c30e 5002dd14 files · +31 −52Browse files

Unified · Split

4 files

fs/exofs/file.c +17 −12
fs/exofs/inode.c +2 −7
fs/exofs/ios.c +12 −32
fs/exofs/super.c +0 −1

fs/exofs/file.c+17−12

@@ -30,9 +30,6 @@ · 29 unmodified lines
30	30	* along with exofs; if not, write to the Free Software
31	31	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
32	32	*/
33		−
34		−#include <linux/buffer_head.h>
35		−
36	33	#include "exofs.h"
37	34
38	35	static int exofs_release_file(struct inode inode, struct file filp)
@@ -40,19 +37,27 @@ static int exofs_release_file(struct inode inode, struct file filp) · 1 unmodified line
40	37	return 0;
41	38	}
42	39
	40	+/* exofs_file_fsync - flush the inode to disk
	41	+ *
	42	+ * Note, in exofs all metadata is written as part of inode, regardless.
	43	+ * The writeout is synchronous
	44	+ */
43	45	static int exofs_file_fsync(struct file *filp, int datasync)
44	46	{
45	47	int ret;
46		− struct address_space *mapping = filp->f_mapping;
47		− struct inode *inode = mapping->host;
	48	+ struct inode *inode = filp->f_mapping->host;
	49	+ struct writeback_control wbc = {
	50	+ .sync_mode = WB_SYNC_ALL,
	51	+ .nr_to_write = 0, /* metadata-only; caller takes care of data */
	52	+ };
48	53	struct super_block *sb;
49	54
50		− ret = filemap_write_and_wait(mapping);
51		− if (ret)
52		− return ret;
	55	+ if (!(inode->i_state & I_DIRTY))
	56	+ return 0;
	57	+ if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
	58	+ return 0;
53	59
54		− /* sync the inode attributes */
55		− ret = write_inode_now(inode, 1);
	60	+ ret = sync_inode(inode, &wbc);
56	61
57	62	/* This is a good place to write the sb */
58	63	/* TODO: Sechedule an sb-sync on create */
@@ -65,9 +70,9 @@ static int exofs_file_fsync(struct file *filp, int datasync) · 6 unmodified lines
65	70
66	71	static int exofs_flush(struct file *file, fl_owner_t id)
67	72	{
68		− exofs_file_fsync(file, 1);
	73	+ int ret = vfs_fsync(file, 0);
69	74	/* TODO: Flush the OSD target */
70		− return 0;
	75	+ return ret;
71	76	}
72	77
73	78	const struct file_operations exofs_file_operations = {

fs/exofs/inode.c+2−7

@@ -32,9 +32,6 @@ · 31 unmodified lines
32	32	*/
33	33
34	34	#include <linux/slab.h>
35		−#include <linux/writeback.h>
36		−#include <linux/buffer_head.h>
37		−#include <scsi/scsi_device.h>
38	35
39	36	#include "exofs.h"
40	37
@@ -773,15 +770,13 @@ static int exofs_releasepage(struct page *page, gfp_t gfp) · 732 unmodified lines
773	770	{
774	771	EXOFS_DBGMSG("page 0x%lx\n", page->index);
775	772	WARN_ON(1);
776		− return try_to_free_buffers(page);
	773	+ return 0;
777	774	}
778	775
779	776	static void exofs_invalidatepage(struct page *page, unsigned long offset)
780	777	{
781		− EXOFS_DBGMSG("page_has_buffers=>%d\n", page_has_buffers(page));
	778	+ EXOFS_DBGMSG("page 0x%lx offset 0x%lx\n", page->index, offset);
782	779	WARN_ON(1);
783		−
784		− block_invalidatepage(page, offset);
785	780	}
786	781
787	782	const struct address_space_operations exofs_aops = {

fs/exofs/ios.c+12−32

@@ -305,8 +305,6 @@ int exofs_check_io(struct exofs_io_state ios, u64 resid) · 304 unmodified lines
305	305	struct _striping_info {
306	306	u64 obj_offset;
307	307	u64 group_length;
308		− u64 total_group_length;
309		− u64 Major;
310	308	unsigned dev;
311	309	unsigned unit_off;
312	310	};
@@ -343,8 +341,6 @@ static void _calc_stripe_info(struct exofs_io_state *ios, u64 file_offset, · 30 unmodified lines
343	341	(M * group_depth * stripe_unit);
344	342
345	343	si->group_length = T - H;
346		− si->total_group_length = T;
347		− si->Major = M;
348	344	}
349	345
350	346	static int _add_stripe_unit(struct exofs_io_state ios, unsigned cur_pg,
@@ -392,20 +388,19 @@ static int _add_stripe_unit(struct exofs_io_state ios, unsigned cur_pg, · 41 unmodified lines
392	388	}
393	389
394	390	static int _prepare_one_group(struct exofs_io_state *ios, u64 length,
395		− struct _striping_info *si, unsigned first_comp)
	391	+ struct _striping_info *si)
396	392	{
397	393	unsigned stripe_unit = ios->layout->stripe_unit;
398	394	unsigned mirrors_p1 = ios->layout->mirrors_p1;
399	395	unsigned devs_in_group = ios->layout->group_width * mirrors_p1;
400	396	unsigned dev = si->dev;
401	397	unsigned first_dev = dev - (dev % devs_in_group);
402		− unsigned comp = first_comp + (dev - first_dev);
403	398	unsigned max_comp = ios->numdevs ? ios->numdevs - mirrors_p1 : 0;
404	399	unsigned cur_pg = ios->pages_consumed;
405	400	int ret = 0;
406	401
407	402	while (length) {
408		− struct exofs_per_dev_state *per_dev = &ios->per_dev[comp];
	403	+ struct exofs_per_dev_state *per_dev = &ios->per_dev[dev];
409	404	unsigned cur_len, page_off = 0;
410	405
411	406	if (!per_dev->length) {
@@ -424,11 +419,8 @@ static int _prepare_one_group(struct exofs_io_state *ios, u64 length, · 12 unmodified lines
424	419	cur_len = stripe_unit;
425	420	}
426	421
427		− if (max_comp < comp)
428		− max_comp = comp;
429		−
430		− dev += mirrors_p1;
431		− dev = (dev % devs_in_group) + first_dev;
	422	+ if (max_comp < dev)
	423	+ max_comp = dev;
432	424	} else {
433	425	cur_len = stripe_unit;
434	426	}
@@ -440,8 +432,8 @@ static int _prepare_one_group(struct exofs_io_state *ios, u64 length, · 5 unmodified lines
440	432	if (unlikely(ret))
441	433	goto out;
442	434
443		− comp += mirrors_p1;
444		− comp = (comp % devs_in_group) + first_comp;
	435	+ dev += mirrors_p1;
	436	+ dev = (dev % devs_in_group) + first_dev;
445	437
446	438	length -= cur_len;
447	439	}
@@ -454,18 +446,15 @@ out: · 6 unmodified lines
454	446	static int _prepare_for_striping(struct exofs_io_state *ios)
455	447	{
456	448	u64 length = ios->length;
	449	+ u64 offset = ios->offset;
457	450	struct _striping_info si;
458		− unsigned devs_in_group = ios->layout->group_width *
459		− ios->layout->mirrors_p1;
460		− unsigned first_comp = 0;
461	451	int ret = 0;
462	452
463		− _calc_stripe_info(ios, ios->offset, &si);
464		−
465	453	if (!ios->pages) {
466	454	if (ios->kern_buff) {
467	455	struct exofs_per_dev_state *per_dev = &ios->per_dev[0];
468	456
	457	+ _calc_stripe_info(ios, ios->offset, &si);
469	458	per_dev->offset = si.obj_offset;
470	459	per_dev->dev = si.dev;
471	460
@@ -479,26 +468,17 @@ static int _prepare_for_striping(struct exofs_io_state *ios) · 7 unmodified lines
479	468	}
480	469
481	470	while (length) {
	471	+ _calc_stripe_info(ios, offset, &si);
	472	+
482	473	if (length < si.group_length)
483	474	si.group_length = length;
484	475
485		− ret = _prepare_one_group(ios, si.group_length, &si, first_comp);
	476	+ ret = _prepare_one_group(ios, si.group_length, &si);
486	477	if (unlikely(ret))
487	478	goto out;
488	479
	480	+ offset += si.group_length;
489	481	length -= si.group_length;
490		−
491		− si.group_length = si.total_group_length;
492		− si.unit_off = 0;
493		− ++si.Major;
494		− si.obj_offset = si.Major * ios->layout->stripe_unit *
495		− ios->layout->group_depth;
496		−
497		− si.dev = (si.dev - (si.dev % devs_in_group)) + devs_in_group;
498		− si.dev %= ios->layout->s_numdevs;
499		−
500		− first_comp += devs_in_group;
501		− first_comp %= ios->layout->s_numdevs;
502	482	}
503	483
504	484	out:

fs/exofs/super.c+0−1

@@ -31,7 +31,6 @@ · 30 unmodified lines
31	31	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
32	32	*/
33	33
34		−#include <linux/smp_lock.h>
35	34	#include <linux/string.h>
36	35	#include <linux/parser.h>
37	36	#include <linux/vfs.h>

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code