Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 (03e4970c) · Commits · 戴 / test

fs/ocfs2/acl.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@
		#include <linux/slab.h>
		#include <linux/string.h>

		#define MLOG_MASK_PREFIX ML_INODE
		#include <cluster/masklog.h>

		#include "ocfs2.h"

fs/ocfs2/alloc.c

+92 −122

File changed.

Preview size limit exceeded, changes collapsed.

fs/ocfs2/aops.c

+39 −43

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		#include <linux/mpage.h>
		#include <linux/quotaops.h>

		#define MLOG_MASK_PREFIX ML_FILE_IO
		#include <cluster/masklog.h>

		#include "ocfs2.h"
		@@ -45,6 +44,7 @@
		#include "super.h"
		#include "symlink.h"
		#include "refcounttree.h"
		#include "ocfs2_trace.h"

		#include "buffer_head_io.h"

		@@ -59,7 +59,8 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
		struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
		void *kaddr;

		mlog_entry("(0x%p, %llu, 0x%p, %d)\n", inode,
		trace_ocfs2_symlink_get_block(
		(unsigned long long)OCFS2_I(inode)->ip_blkno,
		(unsigned long long)iblock, bh_result, create);

		BUG_ON(ocfs2_inode_is_fast_symlink(inode));
		@@ -123,7 +124,6 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
		bail:
		brelse(bh);

		mlog_exit(err);
		return err;
		}

		@@ -136,7 +136,7 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock,
		u64 p_blkno, count, past_eof;
		struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

		mlog_entry("(0x%p, %llu, 0x%p, %d)\n", inode,
		trace_ocfs2_get_block((unsigned long long)OCFS2_I(inode)->ip_blkno,
		(unsigned long long)iblock, bh_result, create);

		if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE)
		@@ -199,7 +199,8 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock,
		}

		past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));
		mlog(0, "Inode %lu, past_eof = %llu\n", inode->i_ino,

		trace_ocfs2_get_block_end((unsigned long long)OCFS2_I(inode)->ip_blkno,
		(unsigned long long)past_eof);
		if (create && (iblock >= past_eof))
		set_buffer_new(bh_result);
		@@ -208,7 +209,6 @@ bail:
		if (err < 0)
		err = -EIO;

		mlog_exit(err);
		return err;
		}

		@@ -278,7 +278,8 @@ static int ocfs2_readpage(struct file file, struct page page)
		loff_t start = (loff_t)page->index << PAGE_CACHE_SHIFT;
		int ret, unlock = 1;

		mlog_entry("(0x%p, %lu)\n", file, (page ? page->index : 0));
		trace_ocfs2_readpage((unsigned long long)oi->ip_blkno,
		(page ? page->index : 0));

		ret = ocfs2_inode_lock_with_page(inode, NULL, 0, page);
		if (ret != 0) {
		@@ -323,7 +324,6 @@ out_inode_unlock:
		out:
		if (unlock)
		unlock_page(page);
		mlog_exit(ret);
		return ret;
		}

		@@ -396,15 +396,11 @@ out_unlock:
		*/
		static int ocfs2_writepage(struct page page, struct writeback_control wbc)
		{
		int ret;

		mlog_entry("(0x%p)\n", page);

		ret = block_write_full_page(page, ocfs2_get_block, wbc);

		mlog_exit(ret);
		trace_ocfs2_writepage(
		(unsigned long long)OCFS2_I(page->mapping->host)->ip_blkno,
		page->index);

		return ret;
		return block_write_full_page(page, ocfs2_get_block, wbc);
		}

		/* Taken from ext3. We don't necessarily need the full blown
		@@ -450,7 +446,8 @@ static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block)
		int err = 0;
		struct inode *inode = mapping->host;

		mlog_entry("(block = %llu)\n", (unsigned long long)block);
		trace_ocfs2_bmap((unsigned long long)OCFS2_I(inode)->ip_blkno,
		(unsigned long long)block);

		/* We don't need to lock journal system files, since they aren't
		* accessed concurrently from multiple nodes.
		@@ -484,8 +481,6 @@ static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block)
		bail:
		status = err ? 0 : p_blkno;

		mlog_exit((int)status);

		return status;
		}

		@@ -616,9 +611,6 @@ static ssize_t ocfs2_direct_IO(int rw,
		{
		struct file *file = iocb->ki_filp;
		struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;
		int ret;

		mlog_entry_void();

		/*
		* Fallback to buffered I/O if we see an inode without
		@@ -631,13 +623,10 @@ static ssize_t ocfs2_direct_IO(int rw,
		if (i_size_read(inode) <= offset)
		return 0;

		ret = __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev,
		return __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev,
		iov, offset, nr_segs,
		ocfs2_direct_IO_get_blocks,
		ocfs2_dio_end_io, NULL, 0);

		mlog_exit(ret);
		return ret;
		}

		static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb,
		@@ -1026,6 +1015,12 @@ static int ocfs2_prepare_page_for_write(struct inode inode, u64 p_blkno,
		ocfs2_figure_cluster_boundaries(OCFS2_SB(inode->i_sb), cpos,
		&cluster_start, &cluster_end);

		/* treat the write as new if the a hole/lseek spanned across
		* the page boundary.
		*/
		new = new \| ((i_size_read(inode) <= page_offset(page)) &&
		(page_offset(page) <= user_pos));

		if (page == wc->w_target_page) {
		map_from = user_pos & (PAGE_CACHE_SIZE - 1);
		map_to = map_from + user_len;
		@@ -1534,8 +1529,8 @@ static int ocfs2_try_to_write_inline_data(struct address_space *mapping,
		struct ocfs2_inode_info *oi = OCFS2_I(inode);
		struct ocfs2_dinode *di = NULL;

		mlog(0, "Inode %llu, write of %u bytes at off %llu. features: 0x%x\n",
		(unsigned long long)oi->ip_blkno, len, (unsigned long long)pos,
		trace_ocfs2_try_to_write_inline_data((unsigned long long)oi->ip_blkno,
		len, (unsigned long long)pos,
		oi->ip_dyn_features);

		/*
		@@ -1739,6 +1734,13 @@ try_again:

		di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;

		trace_ocfs2_write_begin_nolock(
		(unsigned long long)OCFS2_I(inode)->ip_blkno,
		(long long)i_size_read(inode),
		le32_to_cpu(di->i_clusters),
		pos, len, flags, mmap_page,
		clusters_to_alloc, extents_to_split);

		/*
		* We set w_target_from, w_target_to here so that
		* ocfs2_write_end() knows which range in the target page to
		@@ -1751,12 +1753,6 @@ try_again:
		* ocfs2_lock_allocators(). It greatly over-estimates
		* the work to be done.
		*/
		mlog(0, "extend inode %llu, i_size = %lld, di->i_clusters = %u,"
		" clusters_to_add = %u, extents_to_split = %u\n",
		(unsigned long long)OCFS2_I(inode)->ip_blkno,
		(long long)i_size_read(inode), le32_to_cpu(di->i_clusters),
		clusters_to_alloc, extents_to_split);

		ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode),
		wc->w_di_bh);
		ret = ocfs2_lock_allocators(inode, &et,
		@@ -1938,8 +1934,8 @@ static void ocfs2_write_end_inline(struct inode *inode, loff_t pos,
		memcpy(di->id2.i_data.id_data + pos, kaddr + pos, *copied);
		kunmap_atomic(kaddr, KM_USER0);

		mlog(0, "Data written to inode at offset %llu. "
		"id_count = %u, copied = %u, i_dyn_features = 0x%x\n",
		trace_ocfs2_write_end_inline(
		(unsigned long long)OCFS2_I(inode)->ip_blkno,
		(unsigned long long)pos, *copied,
		le16_to_cpu(di->id2.i_data.id_count),
		le16_to_cpu(di->i_dyn_features));

fs/ocfs2/buffer_head_io.c

+18 −31

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@
		#include "inode.h"
		#include "journal.h"
		#include "uptodate.h"

		#include "buffer_head_io.h"
		#include "ocfs2_trace.h"

		/*
		* Bits on bh->b_state used by ocfs2.
		@@ -55,8 +55,7 @@ int ocfs2_write_block(struct ocfs2_super osb, struct buffer_head bh,
		{
		int ret = 0;

		mlog_entry("(bh->b_blocknr = %llu, ci=%p)\n",
		(unsigned long long)bh->b_blocknr, ci);
		trace_ocfs2_write_block((unsigned long long)bh->b_blocknr, ci);

		BUG_ON(bh->b_blocknr < OCFS2_SUPER_BLOCK_BLKNO);
		BUG_ON(buffer_jbd(bh));
		@@ -66,6 +65,7 @@ int ocfs2_write_block(struct ocfs2_super osb, struct buffer_head bh,
		* can get modified during recovery even if read-only. */
		if (ocfs2_is_hard_readonly(osb)) {
		ret = -EROFS;
		mlog_errno(ret);
		goto out;
		}

		@@ -91,11 +91,11 @@ int ocfs2_write_block(struct ocfs2_super osb, struct buffer_head bh,
		* uptodate. */
		ret = -EIO;
		put_bh(bh);
		mlog_errno(ret);
		}

		ocfs2_metadata_cache_io_unlock(ci);
		out:
		mlog_exit(ret);
		return ret;
		}

		@@ -106,10 +106,10 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
		unsigned int i;
		struct buffer_head *bh;

		if (!nr) {
		mlog(ML_BH_IO, "No buffers will be read!\n");
		trace_ocfs2_read_blocks_sync((unsigned long long)block, nr);

		if (!nr)
		goto bail;
		}

		for (i = 0 ; i < nr ; i++) {
		if (bhs[i] == NULL) {
		@@ -123,9 +123,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
		bh = bhs[i];

		if (buffer_jbd(bh)) {
		mlog(ML_BH_IO,
		"trying to sync read a jbd "
		"managed bh (blocknr = %llu), skipping\n",
		trace_ocfs2_read_blocks_sync_jbd(
		(unsigned long long)bh->b_blocknr);
		continue;
		}
		@@ -186,8 +184,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
		struct buffer_head *bh;
		struct super_block *sb = ocfs2_metadata_cache_get_super(ci);

		mlog_entry("(ci=%p, block=(%llu), nr=(%d), flags=%d)\n",
		ci, (unsigned long long)block, nr, flags);
		trace_ocfs2_read_blocks_begin(ci, (unsigned long long)block, nr, flags);

		BUG_ON(!ci);
		BUG_ON((flags & OCFS2_BH_READAHEAD) &&
		@@ -207,7 +204,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
		}

		if (nr == 0) {
		mlog(ML_BH_IO, "No buffers will be read!\n");
		status = 0;
		goto bail;
		}
		@@ -251,8 +247,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
		*/

		if (!ignore_cache && !ocfs2_buffer_uptodate(ci, bh)) {
		mlog(ML_UPTODATE,
		"bh (%llu), owner %llu not uptodate\n",
		trace_ocfs2_read_blocks_from_disk(
		(unsigned long long)bh->b_blocknr,
		(unsigned long long)ocfs2_metadata_cache_owner(ci));
		/* We're using ignore_cache here to say
		@@ -260,11 +255,10 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
		ignore_cache = 1;
		}

		trace_ocfs2_read_blocks_bh((unsigned long long)bh->b_blocknr,
		ignore_cache, buffer_jbd(bh), buffer_dirty(bh));

		if (buffer_jbd(bh)) {
		if (ignore_cache)
		mlog(ML_BH_IO, "trying to sync read a jbd "
		"managed bh (blocknr = %llu)\n",
		(unsigned long long)bh->b_blocknr);
		continue;
		}

		@@ -272,9 +266,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
		if (buffer_dirty(bh)) {
		/* This should probably be a BUG, or
		* at least return an error. */
		mlog(ML_BH_IO, "asking me to sync read a dirty "
		"buffer! (blocknr = %llu)\n",
		(unsigned long long)bh->b_blocknr);
		continue;
		}

		@@ -367,14 +358,11 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
		}
		ocfs2_metadata_cache_io_unlock(ci);

		mlog(ML_BH_IO, "block=(%llu), nr=(%d), cached=%s, flags=0x%x\n",
		(unsigned long long)block, nr,
		((flags & OCFS2_BH_IGNORE_CACHE) \|\| ignore_cache) ? "no" : "yes",
		flags);
		trace_ocfs2_read_blocks_end((unsigned long long)block, nr,
		flags, ignore_cache);

		bail:

		mlog_exit(status);
		return status;
		}

		@@ -408,13 +396,12 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
		int ret = 0;
		struct ocfs2_dinode di = (struct ocfs2_dinode )bh->b_data;

		mlog_entry_void();

		BUG_ON(buffer_jbd(bh));
		ocfs2_check_super_or_backup(osb->sb, bh->b_blocknr);

		if (ocfs2_is_hard_readonly(osb) \|\| ocfs2_is_soft_readonly(osb)) {
		ret = -EROFS;
		mlog_errno(ret);
		goto out;
		}

		@@ -434,9 +421,9 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
		if (!buffer_uptodate(bh)) {
		ret = -EIO;
		put_bh(bh);
		mlog_errno(ret);
		}

		out:
		mlog_exit(ret);
		return ret;
		}

fs/ocfs2/cluster/heartbeat.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1654,8 +1654,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg)
		struct o2hb_disk_slot *slot;
		struct o2hb_disk_heartbeat_block *hb_block;

		mlog_entry_void();

		ret = o2hb_read_slots(reg, reg->hr_blocks);
		if (ret) {
		mlog_errno(ret);
		@@ -1677,7 +1675,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg)
		}

		out:
		mlog_exit(ret);
		return ret;
		}

Admin message