| Message ID | 1359042738-14522-1-git-send-email-gene@czarc.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Thanks. comments below. On 01/24/2013 11:52 PM, Gene Czarcinski wrote: > Fixed indentation, replace spaces with tabs. > Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> > > Rebased, also fixed compiler warnings > Signed-off-by: Gene Czarcinski <gene@czarc.net> > --- > btrfslabel.c | 57 +++++++++++++++++++++++++++++---------------------------- > 1 file changed, 29 insertions(+), 28 deletions(-) > > diff --git a/btrfslabel.c b/btrfslabel.c > index 88a5196..bea1f89 100644 > --- a/btrfslabel.c > +++ b/btrfslabel.c > @@ -48,42 +48,43 @@ > > static int change_label_unmounted(char *dev, char *nLabel) > { > - struct btrfs_root *root; > - struct btrfs_trans_handle *trans; > - > - /* Open the super_block at the default location > - * and as read-write. > - */ > - root = open_ctree(dev, 0, 1); > - if (!root) /* errors are printed by open_ctree() */ > - return; > - > - trans = btrfs_start_transaction(root, 1); > - strncpy(root->fs_info->super_copy.label, nLabel, BTRFS_LABEL_SIZE); > - root->fs_info->super_copy.label[BTRFS_LABEL_SIZE-1] = 0; > - btrfs_commit_transaction(trans, root); > - > - /* Now we close it since we are done. */ > - close_ctree(root); > + struct btrfs_root *root; > + struct btrfs_trans_handle *trans; > + > + /* Open the super_block at the default location > + * and as read-write. > + */ > + root = open_ctree(dev, 0, 1); > + if (!root) /* errors are printed by open_ctree() */ > + return -1; > + > + trans = btrfs_start_transaction(root, 1); > + strncpy(root->fs_info->super_copy.label, nLabel, BTRFS_LABEL_SIZE); > + root->fs_info->super_copy.label[BTRFS_LABEL_SIZE-1] = 0; > + btrfs_commit_transaction(trans, root); > + > + /* Now we close it since we are done. */ > + close_ctree(root); > + return 0; > } > > int get_label_unmounted(char *dev) > { > - struct btrfs_root *root; > + struct btrfs_root *root; > > - /* Open the super_block at the default location > - * and as read-only. > - */ > - root = open_ctree(dev, 0, 0); > + /* Open the super_block at the default location > + * and as read-only. > + */ > + root = open_ctree(dev, 0, 0); > > - if(!root) > - return -1; > + if(!root) > + return -1; minor: since you are here, should you add a space after if > - fprintf(stdout, "%s\n", root->fs_info->super_copy.label); > + fprintf(stdout, "%s\n", root->fs_info->super_copy.label); > > - /* Now we close it since we are done. */ > - close_ctree(root); > - return 0; > + /* Now we close it since we are done. */ > + close_ctree(root); > + return 0; > } > > int get_label(char *btrfs_dev) > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/btrfslabel.c b/btrfslabel.c index 88a5196..bea1f89 100644 --- a/btrfslabel.c +++ b/btrfslabel.c @@ -48,42 +48,43 @@ static int change_label_unmounted(char *dev, char *nLabel) { - struct btrfs_root *root; - struct btrfs_trans_handle *trans; - - /* Open the super_block at the default location - * and as read-write. - */ - root = open_ctree(dev, 0, 1); - if (!root) /* errors are printed by open_ctree() */ - return; - - trans = btrfs_start_transaction(root, 1); - strncpy(root->fs_info->super_copy.label, nLabel, BTRFS_LABEL_SIZE); - root->fs_info->super_copy.label[BTRFS_LABEL_SIZE-1] = 0; - btrfs_commit_transaction(trans, root); - - /* Now we close it since we are done. */ - close_ctree(root); + struct btrfs_root *root; + struct btrfs_trans_handle *trans; + + /* Open the super_block at the default location + * and as read-write. + */ + root = open_ctree(dev, 0, 1); + if (!root) /* errors are printed by open_ctree() */ + return -1; + + trans = btrfs_start_transaction(root, 1); + strncpy(root->fs_info->super_copy.label, nLabel, BTRFS_LABEL_SIZE); + root->fs_info->super_copy.label[BTRFS_LABEL_SIZE-1] = 0; + btrfs_commit_transaction(trans, root); + + /* Now we close it since we are done. */ + close_ctree(root); + return 0; } int get_label_unmounted(char *dev) { - struct btrfs_root *root; + struct btrfs_root *root; - /* Open the super_block at the default location - * and as read-only. - */ - root = open_ctree(dev, 0, 0); + /* Open the super_block at the default location + * and as read-only. + */ + root = open_ctree(dev, 0, 0); - if(!root) - return -1; + if(!root) + return -1; - fprintf(stdout, "%s\n", root->fs_info->super_copy.label); + fprintf(stdout, "%s\n", root->fs_info->super_copy.label); - /* Now we close it since we are done. */ - close_ctree(root); - return 0; + /* Now we close it since we are done. */ + close_ctree(root); + return 0; } int get_label(char *btrfs_dev)