[Ocfs2-tools-devel] [PATCH 7/7] Modify "Remove slot" to not coexist with others, take 3

[Mark Fasheh]

On Mon, Nov 05, 2007 at 03:50:59PM +0800, tao.ma wrote:
> Let the function "Remove slot" doesn't run with
> "sparse" function in tunefs.ocfs2.
> 
> Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>


Your patch is good, so feel free to commit as-is.

To change the subject slightly, I wonder if we could figure out a nicer way
of handling all those tunefs option flags... It's starting to get rather
clumsy to keep repeating all those large if statements all over the code.
	--Mark

> ---
>  tunefs.ocfs2/remove_slot.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/tunefs.ocfs2/remove_slot.c b/tunefs.ocfs2/remove_slot.c
> index 90369b1..1e4238a 100644
> --- a/tunefs.ocfs2/remove_slot.c
> +++ b/tunefs.ocfs2/remove_slot.c
> @@ -756,7 +756,8 @@ errcode_t remove_slot_check(ocfs2_filesys *fs)
>  	 * options to keep things simple.
>  	 */
>  	if (opts.backup_super ||opts.vol_label ||
> -	     opts.mount || opts.jrnl_size || opts.num_blocks) {
> +	     opts.mount || opts.jrnl_size || opts.num_blocks ||
> +	     opts.list_sparse || opts.feature_string) {
>  		com_err(opts.progname, 0, "Cannot remove slot"
>  			" along with other tasks");
>  		exit(1);
> -- 
> 1.5.3.2.g4f337
> 
> _______________________________________________
> Ocfs2-tools-devel mailing list
> Ocfs2-tools-devel at oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-tools-devel
--
Mark Fasheh
Senior Software Developer, Oracle
mark.fasheh at oracle.com