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

Commit e36aeee6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: fix rename vs unlink race
  [PATCH] Fix possibly too long write in o2hb_setup_one_bio()
  ocfs2: fix write() performance regression
  ocfs2: Commit journal on sync writes
  ocfs2: Re-order iput in ocfs2_drop_dentry_lock
  ocfs2: Create locks at initially requested level
  [PATCH] Fix priority mistakes in fs/ocfs2/{alloc.c, dlmglue.c}
  [2.6 patch] make ocfs2_find_entry_el() static
parents b2f051ae e325a88f

fs/ocfs2/alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -3946,7 +3946,7 @@ static int __ocfs2_mark_extent_written(struct inode *inode, 
	struct ocfs2_merge_ctxt ctxt;

	struct ocfs2_extent_list *rightmost_el;



	if (!rec->e_flags & OCFS2_EXT_UNWRITTEN) {

	if (!(rec->e_flags & OCFS2_EXT_UNWRITTEN)) {

		ret = -EIO;

		mlog_errno(ret);

		goto out;

fs/ocfs2/aops.c

+22 −0
Original line number Diff line number Diff line
@@ -728,6 +728,27 @@ static void ocfs2_clear_page_regions(struct page *page, 
	kunmap_atomic(kaddr, KM_USER0);

}



/*

 * Nonsparse file systems fully allocate before we get to the write

 * code. This prevents ocfs2_write() from tagging the write as an

 * allocating one, which means ocfs2_map_page_blocks() might try to

 * read-in the blocks at the tail of our file. Avoid reading them by

 * testing i_size against each block offset.

 */

static int ocfs2_should_read_blk(struct inode *inode, struct page *page,

				 unsigned int block_start)

{

	u64 offset = page_offset(page) + block_start;



	if (ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)))

		return 1;



	if (i_size_read(inode) > offset)

		return 1;



	return 0;

}



/*

 * Some of this taken from block_prepare_write(). We already have our

 * mapping by now though, and the entire write will be allocating or
@@ -781,6 +802,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno, 
				set_buffer_uptodate(bh);

		} else if (!buffer_uptodate(bh) && !buffer_delay(bh) &&

			   !buffer_new(bh) &&

			   ocfs2_should_read_blk(inode, page, block_start) &&

			   (block_start < from || block_end > to)) {

			ll_rw_block(READ, 1, &bh);

			*wait_bh++=bh;

fs/ocfs2/cluster/heartbeat.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg, 
		current_page = cs / spp;

		page = reg->hr_slot_data[current_page];



		vec_len = min(PAGE_CACHE_SIZE,

		vec_len = min(PAGE_CACHE_SIZE - vec_start,

			      (max_slots-cs) * (PAGE_CACHE_SIZE/spp) );



		mlog(ML_HB_BIO, "page %d, vec_len = %u, vec_start = %u\n",

fs/ocfs2/dcache.c

+1 −1
Original line number Diff line number Diff line
@@ -318,9 +318,9 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry, 
static void ocfs2_drop_dentry_lock(struct ocfs2_super *osb,

				   struct ocfs2_dentry_lock *dl)

{

	iput(dl->dl_inode);

	ocfs2_simple_drop_lockres(osb, &dl->dl_lockres);

	ocfs2_lock_res_free(&dl->dl_lockres);

	iput(dl->dl_inode);

	kfree(dl);

}

fs/ocfs2/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static struct buffer_head *ocfs2_find_entry_id(const char *name, 
	return NULL;

}



struct buffer_head *ocfs2_find_entry_el(const char *name, int namelen,

static struct buffer_head *ocfs2_find_entry_el(const char *name, int namelen,

					       struct inode *dir,

					       struct ocfs2_dir_entry **res_dir)

{