Commit d659072f authored by Tao Ma's avatar Tao Ma Committed by Mark Fasheh
Browse files

[PATCH 1/2] ocfs2: Add group extend for online resize 



This patch adds the ability for a userspace program to request an extend of
last cluster group on an Ocfs2 file system. The request is made via ioctl,
OCFS2_IOC_GROUP_EXTEND. This is derived from EXT3_IOC_GROUP_EXTEND, but is
obviously Ocfs2 specific.

tunefs.ocfs2 would call this for an online-resize operation if the last
cluster group isn't full.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 7f68fc28

fs/ocfs2/Makefile

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

	localalloc.o 		\

	mmap.o 			\

	mmap.o 			\

	namei.o 		\

	namei.o 		\

	resize.o		\

	slot_map.o 		\

	slot_map.o 		\

	suballoc.o 		\

	suballoc.o 		\

	super.o 		\

	super.o 		\

fs/ocfs2/buffer_head_io.c

+61 −0
Original line number Original line Diff line number Diff line
@@ -280,3 +280,64 @@ bail: 
	mlog_exit(status);

	mlog_exit(status);

	return status;

	return status;

}

}



/* Check whether the blkno is the super block or one of the backups. */

static void ocfs2_check_super_or_backup(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 backups 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));

	ocfs2_check_super_or_backup(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)) {

		ret = -EIO;

		brelse(bh);

	}



out:

	mlog_exit(ret);

	return ret;

}

fs/ocfs2/buffer_head_io.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,8 @@ int ocfs2_read_blocks(struct ocfs2_super *osb, 
		      int                  flags,

		      int                  flags,

		      struct inode        *inode);

		      struct inode        *inode);





int ocfs2_write_super_or_backup(struct ocfs2_super *osb,

				struct buffer_head *bh);





#define OCFS2_BH_CACHED            1

#define OCFS2_BH_CACHED            1

#define OCFS2_BH_READAHEAD         8

#define OCFS2_BH_READAHEAD         8

fs/ocfs2/ioctl.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 




#include "ocfs2_fs.h"

#include "ocfs2_fs.h"

#include "ioctl.h"

#include "ioctl.h"

#include "resize.h"





#include <linux/ext2_fs.h>

#include <linux/ext2_fs.h>
@@ -115,6 +116,7 @@ int ocfs2_ioctl(struct inode * inode, struct file * filp, 
	unsigned int cmd, unsigned long arg)

	unsigned int cmd, unsigned long arg)

{

{

	unsigned int flags;

	unsigned int flags;

	int new_clusters;

	int status;

	int status;

	struct ocfs2_space_resv sr;

	struct ocfs2_space_resv sr;
@@ -140,6 +142,11 @@ int ocfs2_ioctl(struct inode * inode, struct file * filp, 
			return -EFAULT;

			return -EFAULT;





		return ocfs2_change_file_space(filp, cmd, &sr);

		return ocfs2_change_file_space(filp, cmd, &sr);

	case OCFS2_IOC_GROUP_EXTEND:

		if (get_user(new_clusters, (int __user *)arg))

			return -EFAULT;



		return ocfs2_group_extend(inode, new_clusters);

	default:

	default:

		return -ENOTTY;

		return -ENOTTY;

	}

	}
@@ -162,6 +169,7 @@ long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	case OCFS2_IOC_RESVSP64:

	case OCFS2_IOC_RESVSP64:

	case OCFS2_IOC_UNRESVSP:

	case OCFS2_IOC_UNRESVSP:

	case OCFS2_IOC_UNRESVSP64:

	case OCFS2_IOC_UNRESVSP64:

	case OCFS2_IOC_GROUP_EXTEND:

		break;

		break;

	default:

	default:

		return -ENOIOCTLCMD;

		return -ENOIOCTLCMD;

fs/ocfs2/journal.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -278,6 +278,9 @@ int ocfs2_journal_dirty_data(handle_t *handle, 
/* simple file updates like chmod, etc. */

/* simple file updates like chmod, etc. */

#define OCFS2_INODE_UPDATE_CREDITS 1

#define OCFS2_INODE_UPDATE_CREDITS 1





/* group extend. inode update and last group update. */

#define OCFS2_GROUP_EXTEND_CREDITS	(OCFS2_INODE_UPDATE_CREDITS + 1)



/* get one bit out of a suballocator: dinode + group descriptor +

/* get one bit out of a suballocator: dinode + group descriptor +

 * prev. group desc. if we relink. */

 * prev. group desc. if we relink. */

#define OCFS2_SUBALLOC_ALLOC (3)

#define OCFS2_SUBALLOC_ALLOC (3)

CRA Git | Maintained and supported by SUSTech CRA and CCSE