Add online resize in ocfs2, take 1

cover

fs/ocfs2/super.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
index be562ac..9aa31bc 100644
@@ -1554,7 +1554,7 @@ static int ocfs2_initialize_super(struct
 	}
 
 	di = (struct ocfs2_dinode *) bitmap_bh->b_data;
-	osb->bitmap_cpg = le16_to_cpu(di->id2.i_chain.cl_cpg);
+	osb->bitmap_cpg = ocfs2_group_bitmap_size(sb) * 8;
 	brelse(bitmap_bh);
 	mlog(0, "cluster bitmap inode: %llu, clusters per group: %u\n",
 	     (unsigned long long)osb->bitmap_blkno, osb->bitmap_cpg);

1.3.3
	--Mark
	--Mark
	--Mark
	--Mark
	--Mark
	--Mark
	--Mark
 fs/ocfs2/buffer_head_io.c |   61 +++++++
 fs/ocfs2/buffer_head_io.h |    2 
 fs/ocfs2/ioctl.c          |    3 
 fs/ocfs2/journal.h        |    3 
 fs/ocfs2/ocfs2_fs.h       |    4 
 fs/ocfs2/suballoc.c       |  376 +++++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/suballoc.h       |    1 
 7 files changed, 449 insertions(+), 1 deletions(-)
index c903741..0f70288 100644
@@ -280,3 +280,64 @@ bail:
 	mlog_exit(status);
 	return status;
 }
+
+static inline void check_blkno(struct super_block *sb, sector_t blkno)
+{
+	int i;
+	u64 backup_blkno;
+
+	if (blkno == OCFS2_SUPER_BLOCK_BLKNO)
+		return;
+
+	for (i = 0; i < OCFS2_MAX_BACKUP_SUPERBLOCKS; i++) {
+		backup_blkno = ocfs2_backup_super_blkno(sb, i);
+		if (backup_blkno == blkno)
+			return;
+	}
+
+	BUG();
+}
+/*
+ * Write super block and bakcups doesn't need to collaborate with journal,
+ * so we don't need to lock ip_io_mutex and inode doesn't need to bea passed
+ * into this function.
+ */
+int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
+				struct buffer_head *bh)
+{
+	int ret = 0;
+
+	mlog_entry_void();
+
+	BUG_ON(buffer_jbd(bh));
+	check_blkno(osb->sb, bh->b_blocknr);
+
+	if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) {
+		ret = -EROFS;
+		goto out;
+	}
+
+	lock_buffer(bh);
+	set_buffer_uptodate(bh);
+
+	/* remove from dirty list before I/O. */
+	clear_buffer_dirty(bh);
+
+	get_bh(bh); /* for end_buffer_write_sync() */
+	bh->b_end_io = end_buffer_write_sync;
+	submit_bh(WRITE, bh);
+
+	wait_on_buffer(bh);
+
+	if (!buffer_uptodate(bh)) {
+		/* We don't need to remove the clustered uptodate
+		 * information for this bh as it's not marked locally
+		 * uptodate. */
+		ret = -EIO;
+		brelse(bh);
+	}
+
+out:
+	mlog_exit(ret);
+	return ret;
+}

index 6cc2093..9a5c2fc 100644
@@ -46,6 +46,8 @@ int ocfs2_read_blocks(struct ocfs2_super
 		      struct buffer_head  *bhs[],
 		      int                  flags,
 		      struct inode        *inode);
+int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
+				struct buffer_head *bh);
 
 
 #define OCFS2_BH_CACHED            1

index 87dcece..43ab5ea 100644
@@ -20,6 +20,7 @@ #include "journal.h"
 
 #include "ocfs2_fs.h"
 #include "ioctl.h"
+#include "suballoc.h"
 
 #include <linux/ext2_fs.h>
 

@@ -140,6 +141,8 @@ int ocfs2_ioctl(struct inode * inode, st
 			return -EFAULT;
 
 		return ocfs2_change_file_space(filp, cmd, &sr);
+	case OCFS2_IOC_FSGROWFSDATA:
+		return ocfs2_volume_resize(inode, arg);
 	default:
 		return -ENOTTY;
 	}

index 4b32e09..ae08951 100644
@@ -278,6 +278,9 @@ int                  ocfs2_journal_dirty
 /* simple file updates like chmod, etc. */
 #define OCFS2_INODE_UPDATE_CREDITS 1
 
+/* onine resize. Just dinode + last group descriptor update. */
+#define OCFS2_ONLINE_RESIZE_CREDITS (2)
+
 /* get one bit out of a suballocator: dinode + group descriptor +
  * prev. group desc. if we relink. */
 #define OCFS2_SUBALLOC_ALLOC (3)

index 6ef8767..099d984 100644
@@ -27,7 +27,7 @@ #define _OCFS2_FS_H
 
 /* Version */
 #define OCFS2_MAJOR_REV_LEVEL		0
-#define OCFS2_MINOR_REV_LEVEL          	90
+#define OCFS2_MINOR_REV_LEVEL          	91
 
 /*
  * An OCFS2 volume starts this way:

@@ -231,6 +231,8 @@ #define OCFS2_IOC_FREESP64	_IOW ('X', 37
 #define OCFS2_IOC_RESVSP64	_IOW ('X', 42, struct ocfs2_space_resv)
 #define OCFS2_IOC_UNRESVSP64	_IOW ('X', 43, struct ocfs2_space_resv)
 
+#define OCFS2_IOC_FSGROWFSDATA	_IOW ('X', 110, struct ocfs2_dinode)
+
 /*
  * Journal Flags (ocfs2_dinode.id1.journal1.i_flags)
  */

index cafe937..6d6fe36 100644
@@ -147,4 +147,5 @@ static inline int ocfs2_is_cluster_bitma
 int ocfs2_reserve_cluster_bitmap_bits(struct ocfs2_super *osb,
 				      struct ocfs2_alloc_context *ac);
 
+int ocfs2_volume_resize(struct inode * inode, unsigned long arg);
 #endif /* _CHAINALLOC_H_ */

1.3.3
 fs/ocfs2/buffer_head_io.c |   61 +++++++
 fs/ocfs2/buffer_head_io.h |    2 
 fs/ocfs2/ioctl.c          |    3 
 fs/ocfs2/journal.h        |    3 
 fs/ocfs2/ocfs2_fs.h       |    4 
 fs/ocfs2/suballoc.c       |  376 +++++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/suballoc.h       |    1 
 7 files changed, 449 insertions(+), 1 deletions(-)
index c903741..0f70288 100644

@@ -280,3 +280,64 @@ bail:
 	mlog_exit(status);
 	return status;
 }
+
+static inline void check_blkno(struct super_block *sb, sector_t blkno)

+{
+	int i;
+	u64 backup_blkno;
+
+	if (blkno == OCFS2_SUPER_BLOCK_BLKNO)
+		return;
+
+	for (i = 0; i < OCFS2_MAX_BACKUP_SUPERBLOCKS; i++) {
+		backup_blkno = ocfs2_backup_super_blkno(sb, i);
+		if (backup_blkno == blkno)
+			return;
+	}
+
+	BUG();
+}
+/*
+ * Write super block and bakcups doesn't need to collaborate with journal,
+ * so we don't need to lock ip_io_mutex and inode doesn't need to bea passed
+ * into this function.
+ */
+int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
+				struct buffer_head *bh)
+{
+	int ret = 0;
+
+	mlog_entry_void();
+
+	BUG_ON(buffer_jbd(bh));
+	check_blkno(osb->sb, bh->b_blocknr);
+
+	if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) {
+		ret = -EROFS;
+		goto out;
+	}
+
+	lock_buffer(bh);
+	set_buffer_uptodate(bh);
+
+	/* remove from dirty list before I/O. */
+	clear_buffer_dirty(bh);
+

+	get_bh(bh); /* for end_buffer_write_sync() */
+	bh->b_end_io = end_buffer_write_sync;
+	submit_bh(WRITE, bh);
+
+	wait_on_buffer(bh);
+
+	if (!buffer_uptodate(bh)) {
+		/* We don't need to remove the clustered uptodate
+		 * information for this bh as it's not marked locally
+		 * uptodate. */

+		ret = -EIO;
+		brelse(bh);
+	}
+
+out:
+	mlog_exit(ret);
+	return ret;
+}

index 6cc2093..9a5c2fc 100644
@@ -46,6 +46,8 @@ int ocfs2_read_blocks(struct ocfs2_super
 		      struct buffer_head  *bhs[],
 		      int                  flags,
 		      struct inode        *inode);
+int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
+				struct buffer_head *bh);
 
 
 #define OCFS2_BH_CACHED            1

index 87dcece..43ab5ea 100644
@@ -20,6 +20,7 @@ #include "journal.h"
 
 #include "ocfs2_fs.h"
 #include "ioctl.h"
+#include "suballoc.h"
 
 #include <linux/ext2_fs.h>
 

@@ -140,6 +141,8 @@ int ocfs2_ioctl(struct inode * inode, st
 			return -EFAULT;
 
 		return ocfs2_change_file_space(filp, cmd, &sr);
+	case OCFS2_IOC_FSGROWFSDATA:
+		return ocfs2_volume_resize(inode, arg);

index 4b32e09..ae08951 100644
@@ -278,6 +278,9 @@ int                  ocfs2_journal_dirty
 /* simple file updates like chmod, etc. */
 #define OCFS2_INODE_UPDATE_CREDITS 1
 
+/* onine resize. Just dinode + last group descriptor update. */
+#define OCFS2_ONLINE_RESIZE_CREDITS (2)
+
 /* get one bit out of a suballocator: dinode + group descriptor +
  * prev. group desc. if we relink. */
 #define OCFS2_SUBALLOC_ALLOC (3)

index 6ef8767..099d984 100644

@@ -27,7 +27,7 @@ #define _OCFS2_FS_H
 
 /* Version */
 #define OCFS2_MAJOR_REV_LEVEL		0
-#define OCFS2_MINOR_REV_LEVEL          	90
+#define OCFS2_MINOR_REV_LEVEL          	91

 /*
  * An OCFS2 volume starts this way:

@@ -231,6 +231,8 @@ #define OCFS2_IOC_FREESP64	_IOW ('X', 37
 #define OCFS2_IOC_RESVSP64	_IOW ('X', 42, struct ocfs2_space_resv)
 #define OCFS2_IOC_UNRESVSP64	_IOW ('X', 43, struct ocfs2_space_resv)
 
+#define OCFS2_IOC_FSGROWFSDATA	_IOW ('X', 110, struct ocfs2_dinode)

index 8f09f52..f355628 100644
@@ -1756,6 +1756,382 @@ int ocfs2_free_clusters(handle_t *handle
 	return status;
 }
 
+/*
+ * Check whether there are new backup superblocks exist
+ * in the last group. If there are some, mark them and modify
+ * the group information.
+ *
+ * The number of backups are recorded and returned, so
+ * we can modified the inode accordingly.
+ *
+ * We use the "new" cl_cpg stored in di to calculate the group_no
+ * since the "old" one may lead to the wrong result when there
+ * was only one group in the "old" volume.
+ */
+static u16 ocfs2_add_new_backup_super(struct inode *inode,
+				      struct ocfs2_dinode *di,
+				      struct ocfs2_group_desc *gd,
+				      uint32_t first_new_cluster)
+{
+	int i;
+	u16 cl_cpg = di->id2.i_chain.cl_cpg, backups = 0;
+	u32 group_no, cluster;
+	u32 end_cluster = first_new_cluster + di->i_clusters;
+	u64 blkno, gd_blkno, lgd_blkno = le64_to_cpu(gd->bg_blkno);
+
+	mlog_entry("update the last group=%llu\n", lgd_blkno);
+
+	for (i = 0; i < OCFS2_MAX_BACKUP_SUPERBLOCKS; i++) {
+		blkno = ocfs2_backup_super_blkno(inode->i_sb, i);
+		cluster = ocfs2_blocks_to_clusters(inode->i_sb, blkno);
+
+		if (cluster < first_new_cluster)
+			continue;
+		else if (cluster >= end_cluster)
+			break;
+
+		group_no = cluster / cl_cpg;
+		gd_blkno = ocfs2_clusters_to_blocks(inode->i_sb,
+						    group_no * cl_cpg);
+		if (gd_blkno < lgd_blkno)
+			continue;
+		else if (gd_blkno > lgd_blkno)
+			break;
+
+		mlog(0, "Set cluster %u in the last group\n", cluster);
+		ocfs2_set_bit(cluster % cl_cpg, (unsigned long *)gd->bg_bitmap);
+		le16_add_cpu(&gd->bg_free_bits_count, -1);
+		backups++;
+	}
+
+	mlog_exit_void();
+	return backups;
+}
+/*
+ * update the last group descriptor according to the new added clusters.
+ *
+ * chain: the chain the last group descriptor is in.
+ * backups: the new backup superblocks the last group descriptor has.
+ */
+static int ocfs2_update_last_group(handle_t *handle,
+				   struct inode *bm_inode,
+				   struct buffer_head *bm_bh,
+				   struct ocfs2_dinode *add_di,
+				   uint16_t *chain,
+				   uint16_t *backups)
+{
+	int status = 0;
+	struct ocfs2_super *osb = OCFS2_SB(bm_inode->i_sb);
+	struct ocfs2_dinode *fe = (struct ocfs2_dinode *) bm_bh->b_data;
+	struct buffer_head *group_bh = NULL;
+	struct ocfs2_group_desc *group;
+	u16 cl_cpg, cl_bpc;
+	u32 first_new_cluster, cluster_chunk;
+	u32 num_new_clusters = add_di->i_clusters;
+	u64 bg_blkno;
+	u16 num_bits;
+
+	mlog_entry("(new_clusters=%u)\n", num_new_clusters);
+
+	if (!OCFS2_IS_VALID_DINODE(fe)) {
+		OCFS2_RO_ON_INVALID_DINODE(bm_inode->i_sb, fe);
+		status = -EIO;
+		goto bail;
+	}
+
+	first_new_cluster = le32_to_cpu(fe->i_clusters);
+	bg_blkno = ocfs2_which_cluster_group(bm_inode, first_new_cluster - 1);
+
+	status = ocfs2_read_block(osb, bg_blkno, &group_bh, OCFS2_BH_CACHED,
+				  bm_inode);
+	if (status < 0) {
+		mlog_errno(status);
+		goto bail;
+	}
+
+	group = (struct ocfs2_group_desc *) group_bh->b_data;
+	status = ocfs2_check_group_descriptor(bm_inode->i_sb, fe, group);
+	if (status) {
+		mlog_errno(status);
+		goto bail;
+	}
+
+	status = ocfs2_journal_access(handle, bm_inode, group_bh,
+				      OCFS2_JOURNAL_ACCESS_WRITE);
+	if (status < 0) {
+		mlog_errno(status);
+		goto bail;
+	}
+
+	cl_cpg = add_di->id2.i_chain.cl_cpg;
+	cl_bpc = add_di->id2.i_chain.cl_bpc;
+	/* If possible round off the last group to cpg */
+	cluster_chunk = min(num_new_clusters,
+			    (u32)(cl_cpg - (le16_to_cpu(group->bg_bits)/cl_bpc)));
+	if (cluster_chunk) {
+		num_bits = cluster_chunk * cl_bpc;
+
+		le16_add_cpu(&group->bg_bits, num_bits);
+		le16_add_cpu(&group->bg_free_bits_count, num_bits);
+	}
+
+	/*
+	 * check whether there are some new backup superblocks exist in
+	 * this group.
+	 */
+	*backups = 0;
+	if (OCFS2_HAS_COMPAT_FEATURE(osb->sb,
+				     OCFS2_FEATURE_COMPAT_BACKUP_SB)) {
+		*backups = ocfs2_add_new_backup_super(bm_inode, add_di, group,
+						      first_new_cluster);
+		if (*backups)
+			*chain = le16_to_cpu(group->bg_chain);
+	}
+
+	status = ocfs2_journal_dirty(handle, group_bh);
+	if (status < 0)
+		mlog_errno(status);
+
+bail:
+	if (group_bh)
+		brelse(group_bh);
+
+	mlog_exit(status);
+	return status;

+
+}
+
+static void update_backups(struct inode * inode, u32 clusters, char *data)
+{
+	int i, status = 0;
+	char *backup = NULL;
+	struct ocfs2_dinode *backup_di = NULL;
+	u64 blkno, backup_blknos[OCFS2_MAX_BACKUP_SUPERBLOCKS];
+	struct buffer_head *backups[OCFS2_MAX_BACKUP_SUPERBLOCKS];

+	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+	u32 cluster;
+
+	memset(backups, 0, sizeof(backups));
+	memset(backup_blknos, 0, sizeof(backup_blknos));
+
+	/* calculate the real backups we need to update. */
+	for (i = 0; i < OCFS2_MAX_BACKUP_SUPERBLOCKS; i++) {
+		blkno = ocfs2_backup_super_blkno(inode->i_sb, i);
+		cluster = ocfs2_blocks_to_clusters(inode->i_sb, blkno);
+		 if (cluster > clusters)
+			break;
+
+		backup_blknos[i] = blkno;
+	}
+
+	for (i = 0; i < OCFS2_MAX_BACKUP_SUPERBLOCKS; i++) {
+		if (backup_blknos[i] == 0ULL)
+			break;
+
+		status = ocfs2_read_block(osb, backup_blknos[i] ,
+					  &backups[i], 0, NULL);
+		if (status < 0) {
+			mlog_errno(status);
+			goto out;
+		}
+
+		backup = backups[i]->b_data;
+
+		memcpy(backup, data, inode->i_sb->s_blocksize);
+
+		backup_di = (struct ocfs2_dinode *)backup;
+		backup_di->i_blkno = cpu_to_le64(backup_blknos[i]);
+
+		status = ocfs2_write_super_or_backup(osb, backups[i]);
+		if (status < 0) {
+			mlog_errno(status);
+			goto out;
+		}
+	}
+
+out:
+	for (i = 0; backups[i] != NULL; i++)
+		brelse(backups[i]);
+
+	if (status) {
+		mlog(status, "can't update backups."
+			     "Please run fsck before next mount");
+	}
+}
+/*
+ * ocfs2_volume_resize will update the global bitmap and the last group
+ * descriptor according to the arg.
+ *
+ * arg is organized as an ocfs2_dinode.
+ * di->i_clusters records the new clusters added to the volume.
+ * di->i_chain contains all the new group descriptors information.
+ *
+ * NOTE:
+ * di is already made endian safe by the ocfs2-tools, so we don't need
+ * endian operation for it.
+ */
+int ocfs2_volume_resize(struct inode * inode, unsigned long arg)
+{
+	int status;
+	handle_t *handle;
+	struct buffer_head *main_bm_bh = NULL;
+	struct buffer_head *super_bh = NULL;
+	struct inode *main_bm_inode = NULL;
+	struct ocfs2_dinode *di = NULL;
+	struct ocfs2_dinode *fe = NULL;
+	struct ocfs2_dinode *super_di = NULL;
+	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+	struct ocfs2_chain_list *cl;
+	struct ocfs2_chain_rec *cr, *cr_new;
+	u16 i, backups = 0, chain = 0;
+	u32 clusters = 0;
+
+	mlog_entry_void();
+
+	if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
+		return -EROFS;

+
+	di = kmalloc(osb->sb->s_blocksize, GFP_KERNEL);
+	if (!di)
+		return -ENOMEM;
+
+	if (copy_from_user(di, (int __user *) arg,
+			   osb->sb->s_blocksize)) {
+		status =  -EFAULT;
+		goto out;
+	}

+	main_bm_inode = ocfs2_get_system_file_inode(osb,
+						    GLOBAL_BITMAP_SYSTEM_INODE,
+						    OCFS2_INVALID_SLOT);
+	if (!main_bm_inode) {
+		status = -EINVAL;
+		mlog_errno(status);
+		goto out;
+	}
+
+	mutex_lock(&main_bm_inode->i_mutex);
+
+	status = ocfs2_meta_lock(main_bm_inode, &main_bm_bh, 1);
+	if (status < 0) {
+		mlog_errno(status);
+		goto out_mutex;

+	}
+
+	handle = ocfs2_start_trans(osb, OCFS2_ONLINE_RESIZE_CREDITS);
+	if (IS_ERR(handle)) {
+		mlog_errno(PTR_ERR(handle));
+		handle = NULL;
+		goto out_unlock;
+	}
+
+	/* let the journal update the global bitmap immediately. */

+	handle->h_sync = 1;
+
+	/* update the last group descriptor according to di. */
+	status = ocfs2_update_last_group(handle, main_bm_inode,
+					 main_bm_bh, di, &chain, &backups);
+	if (status) {
+		mlog_errno(status);
+		goto out_unlock;
+	}
+
+	status = ocfs2_journal_access(handle, main_bm_inode, main_bm_bh,
+				      OCFS2_JOURNAL_ACCESS_WRITE);
+	if (status < 0) {
+		mlog_errno(status);
+		goto out_unlock;
+	}
+
+	/*
+	 * update the chain_rec if there are new backups in the last group.

+	 * update the global bitmap inode according to di.
+	 */
+	fe = (struct ocfs2_dinode *)main_bm_bh->b_data;
+	cl = &fe->id2.i_chain;
+
+	if (backups) {
+		cr = (&cl->cl_recs[chain]);
+		le32_add_cpu(&cr->c_free, -1 * backups);
+		le32_add_cpu(&fe->id1.bitmap1.i_used, backups);
+	}

+	for (i = 0; i < le16_to_cpu(cl->cl_count); i++) {
+		cr = &(cl->cl_recs[i]);
+		cr_new = &(di->id2.i_chain.cl_recs[i]);
+		le32_add_cpu(&cr->c_total, cr_new->c_total);
+		le32_add_cpu(&cr->c_free, cr_new->c_free);
+		cr->c_blkno = cpu_to_le64(cr_new->c_blkno);
+	}
+	cl->cl_next_free_rec = cpu_to_le16(di->id2.i_chain.cl_next_free_rec);
+	cl->cl_cpg = cpu_to_le16(di->id2.i_chain.cl_cpg);
+
+	le32_add_cpu(&fe->id1.bitmap1.i_total, di->id1.bitmap1.i_total);
+	le32_add_cpu(&fe->id1.bitmap1.i_used, di->id1.bitmap1.i_used);
+	le32_add_cpu(&fe->i_clusters, di->i_clusters);
+	le64_add_cpu(&fe->i_size, di->i_size);
+
+	status = ocfs2_journal_dirty(handle, main_bm_bh);
+	if (status < 0) {
+		mlog_errno(status);
+		goto out_unlock;
+	}
+
+	spin_lock(&OCFS2_I(main_bm_inode)->ip_lock);
+	OCFS2_I(main_bm_inode)->ip_clusters = le32_to_cpu(fe->i_clusters);
+	clusters = le32_to_cpu(fe->i_clusters);
+	spin_unlock(&OCFS2_I(main_bm_inode)->ip_lock);
+
+	status = ocfs2_commit_trans(osb, handle);
+	if (status < 0) {
+		mlog_errno(status);
+		goto out_unlock;
+	}
+
+	/*
+	 * update the superblock last.
+	 * It doesn't matter if the write failed.
+	 */
+	status = ocfs2_read_block(osb, OCFS2_SUPER_BLOCK_BLKNO,
+				  &super_bh, 0, NULL);
+	if (status < 0) {
+		mlog_errno(status);
+		goto out_unlock;
+	}
+
+	super_di = (struct ocfs2_dinode *)super_bh->b_data;
+	le32_add_cpu(&super_di->i_clusters, di->i_clusters);
+
+	status = ocfs2_write_super_or_backup(osb, super_bh);
+	if (status < 0) {
+		mlog_errno(status);
+		goto out_unlock;
+	}
+
+	if (OCFS2_HAS_COMPAT_FEATURE(osb->sb, OCFS2_FEATURE_COMPAT_BACKUP_SB))
+		update_backups(main_bm_inode, clusters, super_bh->b_data);
+
+out_unlock:
+	if (super_bh)
+		brelse(super_bh);
+
+	if (main_bm_bh)
+		brelse(main_bm_bh);
+
+	ocfs2_meta_unlock(main_bm_inode, 1);
+
+out_mutex:
+	mutex_unlock(&main_bm_inode->i_mutex);
+	iput(main_bm_inode);
+
+out:
+	if (di)
+		kfree(di);
+
+	mlog_exit_void();
+	return status;
+}
+
 static inline void ocfs2_debug_bg(struct ocfs2_group_desc *bg)
 {
 	printk("Block Group:\n");

index cafe937..6d6fe36 100644
@@ -147,4 +147,5 @@ static inline int ocfs2_is_cluster_bitma
 int ocfs2_reserve_cluster_bitmap_bits(struct ocfs2_super *osb,
 				      struct ocfs2_alloc_context *ac);
 
+int ocfs2_volume_resize(struct inode * inode, unsigned long arg);
 #endif /* _CHAINALLOC_H_ */

1.3.3

_______________________________________________
Ocfs2-devel mailing list
[email protected]
http://oss.oracle.com/mailman/listinfo/ocfs2-devel
index 4b32e09..ae08951 100644
@@ -278,6 +278,9 @@ int                  ocfs2_journal_dirty
 /* simple file updates like chmod, etc. */
 #define OCFS2_INODE_UPDATE_CREDITS 1
 
+/* onine resize. Just dinode + last group descriptor update. */
+#define OCFS2_ONLINE_RESIZE_CREDITS (2)
+
 /* get one bit out of a suballocator: dinode + group descriptor +
  * prev. group desc. if we relink. */
 #define OCFS2_SUBALLOC_ALLOC (3)

index 6ef8767..099d984 100644
@@ -27,7 +27,7 @@ #define _OCFS2_FS_H
 

 /* Version */
 #define OCFS2_MAJOR_REV_LEVEL		0
-#define OCFS2_MINOR_REV_LEVEL          	90
+#define OCFS2_MINOR_REV_LEVEL          	91
 

index 4b32e09..ae08951 100644
@@ -278,6 +278,9 @@ int                  ocfs2_journal_dirty
 /* simple file updates like chmod, etc. */
 #define OCFS2_INODE_UPDATE_CREDITS 1
 +/* onine resize. Just dinode + last group descriptor update. */
+#define OCFS2_ONLINE_RESIZE_CREDITS (2)
+
 /* get one bit out of a suballocator: dinode + group descriptor +
  * prev. group desc. if we relink. */
 #define OCFS2_SUBALLOC_ALLOC (3)

index 6ef8767..099d984 100644

@@ -27,7 +27,7 @@ #define _OCFS2_FS_H
  /* Version */
 #define OCFS2_MAJOR_REV_LEVEL		0
-#define OCFS2_MINOR_REV_LEVEL          	90
+#define OCFS2_MINOR_REV_LEVEL          	91
 

	--Mark
index 4b32e09..ae08951 100644
@@ -278,6 +278,9 @@ int                  ocfs2_journal_dirty
 /* simple file updates like chmod, etc. */
 #define OCFS2_INODE_UPDATE_CREDITS 1
 +/* onine resize. Just dinode + last group descriptor update. */
+#define OCFS2_ONLINE_RESIZE_CREDITS (2)
+
 /* get one bit out of a suballocator: dinode + group descriptor +
  * prev. group desc. if we relink. */
 #define OCFS2_SUBALLOC_ALLOC (3)

index 6ef8767..099d984 100644

@@ -27,7 +27,7 @@ #define _OCFS2_FS_H
  /* Version */
 #define OCFS2_MAJOR_REV_LEVEL		0
-#define OCFS2_MINOR_REV_LEVEL          	90
+#define OCFS2_MINOR_REV_LEVEL          	91
 
 

index 4b32e09..ae08951 100644
@@ -278,6 +278,9 @@ int                  ocfs2_journal_dirty
 /* simple file updates like chmod, etc. */
 #define OCFS2_INODE_UPDATE_CREDITS 1
 +/* onine resize. Just dinode + last group descriptor update. */
+#define OCFS2_ONLINE_RESIZE_CREDITS (2)
+
 /* get one bit out of a suballocator: dinode + group descriptor +
  * prev. group desc. if we relink. */
 #define OCFS2_SUBALLOC_ALLOC (3)

index 6ef8767..099d984 100644

--- a/fs/ocfs2/ocfs2_fs.h

@@ -27,7 +27,7 @@ #define _OCFS2_FS_H
  /* Version */
 #define OCFS2_MAJOR_REV_LEVEL		0
-#define OCFS2_MINOR_REV_LEVEL          	90
+#define OCFS2_MINOR_REV_LEVEL          	91
 

	--Mark

Add online resize in ocfs2, take 1

Tao Ma

Tao Ma

Mark Fasheh

Sunil Mushran

Mark Fasheh

Mark Fasheh

tao.ma

tao.ma

Mark Fasheh

Tao Ma

Mark Fasheh

tao.ma

Mark Fasheh

tao.ma

Mark Fasheh