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

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

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (28 commits)
  Ocfs2: Teach local-mounted ocfs2 to handle unwritten_extents correctly.
  ocfs2/dlm: Do not migrate resource to a node that is leaving the domain
  ocfs2/dlm: Add new dlm message DLM_BEGIN_EXIT_DOMAIN_MSG
  Ocfs2/move_extents: Set several trivial constraints for threshold.
  Ocfs2/move_extents: Let defrag handle partial extent moving.
  Ocfs2/move_extents: move/defrag extents within a certain range.
  Ocfs2/move_extents: helper to calculate the defraging length in one run.
  Ocfs2/move_extents: move entire/partial extent.
  Ocfs2/move_extents: helpers to update the group descriptor and global bitmap inode.
  Ocfs2/move_extents: helper to probe a proper region to move in an alloc group.
  Ocfs2/move_extents: helper to validate and adjust moving goal.
  Ocfs2/move_extents: find the victim alloc group, where the given #blk fits.
  Ocfs2/move_extents: defrag a range of extent.
  Ocfs2/move_extents: move a range of extent.
  Ocfs2/move_extents: lock allocators and reserve metadata blocks and data clusters for extents moving.
  Ocfs2/move_extents: Add basic framework and source files for extent moving.
  Ocfs2/move_extents: Adding new ioctl code 'OCFS2_IOC_MOVE_EXT' to ocfs2.
  Ocfs2/refcounttree: Publicize couple of funcs from refcounttree.c
  Ocfs2: Add a new code 'OCFS2_INFO_FREEFRAG' for o2info ioctl.
  Ocfs2: Add a new code 'OCFS2_INFO_FREEINODE' for o2info ioctl.
  ...
parents f8d613e2 ece928df

Documentation/ABI/obsolete/o2cb→Documentation/ABI/removed/o2cb

+4 −5
Original line number Diff line number Diff line 
What:		/sys/o2cb symlink

Date:		Dec 2005

KernelVersion:	2.6.16

Date:		May 2011

KernelVersion:	2.6.40

Contact:	ocfs2-devel@oss.oracle.com

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink will

		be removed when new versions of ocfs2-tools which know to look

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is

		removed when new versions of ocfs2-tools which know to look

		in /sys/fs/o2cb are sufficiently prevalent. Don't code new

		software to look here, it should try /sys/fs/o2cb instead.

		See Documentation/ABI/stable/o2cb for more information on usage.

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

		ocfs2-devel@oss.oracle.com.

Documentation/feature-removal-schedule.txt

+0 −10
Original line number Diff line number Diff line
@@ -262,16 +262,6 @@ Who: Michael Buesch <mb@bu3sch.de> 


---------------------------



What:	/sys/o2cb symlink

When:	January 2010

Why:	/sys/fs/o2cb is the proper location for this information - /sys/o2cb

	exists as a symlink for backwards compatibility for old versions of

	ocfs2-tools. 2 years should be sufficient time to phase in new versions

	which know to look in /sys/fs/o2cb.

Who:	ocfs2-devel@oss.oracle.com



---------------------------



What:	Ability for non root users to shm_get hugetlb pages based on mlock

	resource limits

When:	2.6.31

Documentation/filesystems/ocfs2.txt

+7 −1
Original line number Diff line number Diff line
@@ -46,9 +46,15 @@ errors=panic Panic and halt the machine if an error occurs. 
intr		(*)	Allow signals to interrupt cluster operations.

nointr			Do not allow signals to interrupt cluster

			operations.

noatime			Do not update access time.

relatime(*)		Update atime if the previous atime is older than

			mtime or ctime

strictatime		Always update atime, but the minimum update interval

			is specified by atime_quantum.

atime_quantum=60(*)	OCFS2 will not update atime unless this number

			of seconds has passed since the last update.

			Set to zero to always update atime.

			Set to zero to always update atime. This option need

			work with strictatime.

data=ordered	(*)	All data are forced directly out to the main file

			system prior to its metadata being committed to the

			journal.

fs/ocfs2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ ocfs2-objs := \ 
	namei.o 		\

	refcounttree.o		\

	reservations.o		\

	move_extents.o		\

	resize.o		\

	slot_map.o 		\

	suballoc.o 		\

fs/ocfs2/alloc.c

+166 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/highmem.h>

#include <linux/swap.h>

#include <linux/quotaops.h>

#include <linux/blkdev.h>



#include <cluster/masklog.h>
@@ -7184,3 +7185,168 @@ out_commit: 
out:

	return ret;

}



static int ocfs2_trim_extent(struct super_block *sb,

			     struct ocfs2_group_desc *gd,

			     u32 start, u32 count)

{

	u64 discard, bcount;



	bcount = ocfs2_clusters_to_blocks(sb, count);

	discard = le64_to_cpu(gd->bg_blkno) +

			ocfs2_clusters_to_blocks(sb, start);



	trace_ocfs2_trim_extent(sb, (unsigned long long)discard, bcount);



	return sb_issue_discard(sb, discard, bcount, GFP_NOFS, 0);

}



static int ocfs2_trim_group(struct super_block *sb,

			    struct ocfs2_group_desc *gd,

			    u32 start, u32 max, u32 minbits)

{

	int ret = 0, count = 0, next;

	void *bitmap = gd->bg_bitmap;



	if (le16_to_cpu(gd->bg_free_bits_count) < minbits)

		return 0;



	trace_ocfs2_trim_group((unsigned long long)le64_to_cpu(gd->bg_blkno),

			       start, max, minbits);



	while (start < max) {

		start = ocfs2_find_next_zero_bit(bitmap, max, start);

		if (start >= max)

			break;

		next = ocfs2_find_next_bit(bitmap, max, start);



		if ((next - start) >= minbits) {

			ret = ocfs2_trim_extent(sb, gd,

						start, next - start);

			if (ret < 0) {

				mlog_errno(ret);

				break;

			}

			count += next - start;

		}

		start = next + 1;



		if (fatal_signal_pending(current)) {

			count = -ERESTARTSYS;

			break;

		}



		if ((le16_to_cpu(gd->bg_free_bits_count) - count) < minbits)

			break;

	}



	if (ret < 0)

		count = ret;



	return count;

}



int ocfs2_trim_fs(struct super_block *sb, struct fstrim_range *range)

{

	struct ocfs2_super *osb = OCFS2_SB(sb);

	u64 start, len, trimmed, first_group, last_group, group;

	int ret, cnt;

	u32 first_bit, last_bit, minlen;

	struct buffer_head *main_bm_bh = NULL;

	struct inode *main_bm_inode = NULL;

	struct buffer_head *gd_bh = NULL;

	struct ocfs2_dinode *main_bm;

	struct ocfs2_group_desc *gd = NULL;



	start = range->start >> osb->s_clustersize_bits;

	len = range->len >> osb->s_clustersize_bits;

	minlen = range->minlen >> osb->s_clustersize_bits;

	trimmed = 0;



	if (!len) {

		range->len = 0;

		return 0;

	}



	if (minlen >= osb->bitmap_cpg)

		return -EINVAL;



	main_bm_inode = ocfs2_get_system_file_inode(osb,

						    GLOBAL_BITMAP_SYSTEM_INODE,

						    OCFS2_INVALID_SLOT);

	if (!main_bm_inode) {

		ret = -EIO;

		mlog_errno(ret);

		goto out;

	}



	mutex_lock(&main_bm_inode->i_mutex);



	ret = ocfs2_inode_lock(main_bm_inode, &main_bm_bh, 0);

	if (ret < 0) {

		mlog_errno(ret);

		goto out_mutex;

	}

	main_bm = (struct ocfs2_dinode *)main_bm_bh->b_data;



	if (start >= le32_to_cpu(main_bm->i_clusters)) {

		ret = -EINVAL;

		goto out_unlock;

	}



	if (start + len > le32_to_cpu(main_bm->i_clusters))

		len = le32_to_cpu(main_bm->i_clusters) - start;



	trace_ocfs2_trim_fs(start, len, minlen);



	/* Determine first and last group to examine based on start and len */

	first_group = ocfs2_which_cluster_group(main_bm_inode, start);

	if (first_group == osb->first_cluster_group_blkno)

		first_bit = start;

	else

		first_bit = start - ocfs2_blocks_to_clusters(sb, first_group);

	last_group = ocfs2_which_cluster_group(main_bm_inode, start + len - 1);

	last_bit = osb->bitmap_cpg;



	for (group = first_group; group <= last_group;) {

		if (first_bit + len >= osb->bitmap_cpg)

			last_bit = osb->bitmap_cpg;

		else

			last_bit = first_bit + len;



		ret = ocfs2_read_group_descriptor(main_bm_inode,

						  main_bm, group,

						  &gd_bh);

		if (ret < 0) {

			mlog_errno(ret);

			break;

		}



		gd = (struct ocfs2_group_desc *)gd_bh->b_data;

		cnt = ocfs2_trim_group(sb, gd, first_bit, last_bit, minlen);

		brelse(gd_bh);

		gd_bh = NULL;

		if (cnt < 0) {

			ret = cnt;

			mlog_errno(ret);

			break;

		}



		trimmed += cnt;

		len -= osb->bitmap_cpg - first_bit;

		first_bit = 0;

		if (group == osb->first_cluster_group_blkno)

			group = ocfs2_clusters_to_blocks(sb, osb->bitmap_cpg);

		else

			group += ocfs2_clusters_to_blocks(sb, osb->bitmap_cpg);

	}

	range->len = trimmed * sb->s_blocksize;

out_unlock:

	ocfs2_inode_unlock(main_bm_inode, 0);

	brelse(main_bm_bh);

out_mutex:

	mutex_unlock(&main_bm_inode->i_mutex);

	iput(main_bm_inode);

out:

	return ret;

}