RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-01 22:48:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: move btrfslabel.[c|h] stuff to utils.[c|h]

Browse Source 
Clean btrfslabel.[c|h] out of the source tree and move those related
functions to utils.[c|h].

CC: Gene Czarcinski <gene@czarc.net>
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Jeff Liu 2013-01-30 16:32:47 +08:00 committed by David Sterba
parent 63a44771a4
commit efbbbc88cb
6 changed files with 133 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ CFLAGS = -g -O1
objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
root-tree.o dir-item.o file-item.o inode-item.o \
inode-map.o crc32c.o rbtree.o extent-cache.o extent_io.o \
volumes.o utils.o btrfs-list.o btrfslabel.o repair.o \
volumes.o utils.o btrfs-list.o repair.o \
send-stream.o send-utils.o qgroup.o raid6.o
cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \

154
btrfslabel.c
View File

@ -1,154 +0,0 @@
/*
* Copyright (C) 2008 Morey Roof. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License v2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 021110-1307, USA.
*/
#define _GNU_SOURCE
#ifndef __CHECKER__
#include <sys/ioctl.h>
#include <sys/mount.h>
#include "ioctl.h"
#endif /* __CHECKER__ */
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#include <fcntl.h>
#include <unistd.h>
#include <linux/fs.h>
#include <linux/limits.h>
#include <ctype.h>
#include "kerncompat.h"
#include "ctree.h"
#include "utils.h"
#include "version.h"
#include "disk-io.h"
#include "transaction.h"
#define MOUNTED 1
#define UNMOUNTED 2
#define GET_LABEL 3
#define SET_LABEL 4
static int set_label_unmounted(const char *dev, const char *label)
{
struct btrfs_trans_handle *trans;
struct btrfs_root *root;
int ret;
ret = check_mounted(dev);
if (ret < 0) {
fprintf(stderr, "FATAL: error checking %s mount status\n", dev);
return -1;
}
if (ret > 0) {
fprintf(stderr, "ERROR: dev %s is mounted, use mount point\n",
dev);
return -1;
}
if (strlen(label) > BTRFS_LABEL_SIZE - 1) {
fprintf(stderr, "ERROR: Label %s is too long (max %d)\n",
label, BTRFS_LABEL_SIZE - 1);
return -1;
}
/* 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);
snprintf(root->fs_info->super_copy.label, BTRFS_LABEL_SIZE, "%s",
label);
btrfs_commit_transaction(trans, root);
/* Now we close it since we are done. */
close_ctree(root);
return 0;
}
static int set_label_mounted(const char *mount_path, const char *label)
{
int fd;
fd = open(mount_path, O_RDONLY | O_NOATIME);
if (fd < 0) {
fprintf(stderr, "ERROR: unable access to '%s'\n", mount_path);
return -1;
}
if (ioctl(fd, BTRFS_IOC_SET_FSLABEL, label) < 0) {
fprintf(stderr, "ERROR: unable to set label %s\n",
strerror(errno));
close(fd);
return -1;
}
return 0;
}
int get_label_unmounted(char *dev)
{
struct btrfs_root *root;
/* Open the super_block at the default location
* and as read-only.
*/
root = open_ctree(dev, 0, 0);
if(!root)
return -1;
fprintf(stdout, "%s\n", root->fs_info->super_copy.label);
/* Now we close it since we are done. */
close_ctree(root);
return 0;
}
int get_label(char *btrfs_dev)
{
int ret;
ret = check_mounted(btrfs_dev);
if (ret < 0)
{
fprintf(stderr, "FATAL: error checking %s mount status\n", btrfs_dev);
return -1;
}
if(ret != 0)
{
fprintf(stderr, "FATAL: the filesystem has to be unmounted\n");
return -2;
}
ret = get_label_unmounted(btrfs_dev);
return ret;
}
int set_label(char *btrfs_dev, char *label)
{
return is_existing_blk_or_reg_file(btrfs_dev) ?
set_label_unmounted(btrfs_dev, label) :
set_label_mounted(btrfs_dev, label);
}

5
btrfslabel.h
View File

@ -1,5 +0,0 @@
/* btrflabel.h */
int get_label(char *btrfs_dev);
int set_label(char *btrfs_dev, char *nLabel);

1
cmds-filesystem.c
View File

@ -32,7 +32,6 @@
#include "version.h"
#include "commands.h"
#include "btrfslabel.h"
static const char * const filesystem_cmd_group_usage[] = {
"btrfs filesystem [<group>] <command> [<args>]",

130
utils.c
View File

@ -1,5 +1,6 @@
/*
* Copyright (C) 2007 Oracle. All rights reserved.
* Copyright (C) 2008 Morey Roof. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
@ -19,6 +20,7 @@
#define _XOPEN_SOURCE 700
#define __USE_XOPEN2K8
#define __XOPEN2K8 /* due to an error in dirent.h, to get dirfd() */
#define _GNU_SOURCE /* O_NOATIME */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -1164,6 +1166,134 @@ static int check_label(const char *input)
return 0;
}
static int set_label_unmounted(const char *dev, const char *label)
{
struct btrfs_trans_handle *trans;
struct btrfs_root *root;
int ret;
ret = check_mounted(dev);
if (ret < 0) {
fprintf(stderr, "FATAL: error checking %s mount status\n", dev);
return -1;
}
if (ret > 0) {
fprintf(stderr, "ERROR: dev %s is mounted, use mount point\n",
dev);
return -1;
}
/* 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);
snprintf(root->fs_info->super_copy.label, BTRFS_LABEL_SIZE, "%s",
label);
btrfs_commit_transaction(trans, root);
/* Now we close it since we are done. */
close_ctree(root);
return 0;
}
static int set_label_mounted(const char *mount_path, const char *label)
{
int fd;
fd = open(mount_path, O_RDONLY | O_NOATIME);
if (fd < 0) {
fprintf(stderr, "ERROR: unable access to '%s'\n", mount_path);
return -1;
}
if (ioctl(fd, BTRFS_IOC_SET_FSLABEL, label) < 0) {
fprintf(stderr, "ERROR: unable to set label %s\n",
strerror(errno));
close(fd);
return -1;
}
return 0;
}
static int get_label_unmounted(const char *dev)
{
struct btrfs_root *root;
int ret;
ret = check_mounted(dev);
if (ret < 0) {
fprintf(stderr, "FATAL: error checking %s mount status\n", dev);
return -1;
}
if (ret > 0) {
fprintf(stderr, "ERROR: dev %s is mounted, use mount point\n",
dev);
return -1;
}
/* Open the super_block at the default location
* and as read-only.
*/
root = open_ctree(dev, 0, 0);
if(!root)
return -1;
fprintf(stdout, "%s\n", root->fs_info->super_copy.label);
/* Now we close it since we are done. */
close_ctree(root);
return 0;
}
/*
* If a partition is mounted, try to get the filesystem label via its
* mounted path rather than device. Return the corresponding error
* the user specified the device path.
*/
static int get_label_mounted(const char *mount_path)
{
char label[BTRFS_LABEL_SIZE];
int fd;
fd = open(mount_path, O_RDONLY | O_NOATIME);
if (fd < 0) {
fprintf(stderr, "ERROR: unable access to '%s'\n", mount_path);
return -1;
}
memset(label, '\0', sizeof(label));
if (ioctl(fd, BTRFS_IOC_GET_FSLABEL, label) < 0) {
fprintf(stderr, "ERROR: unable get label %s\n", strerror(errno));
close(fd);
return -1;
}
fprintf(stdout, "%s\n", label);
return 0;
}
int get_label(const char *btrfs_dev)
{
return is_existing_blk_or_reg_file(btrfs_dev) ?
get_label_unmounted(btrfs_dev) :
get_label_mounted(btrfs_dev);
}
int set_label(const char *btrfs_dev, const char *label)
{
if (check_label(label))
return -1;
return is_existing_blk_or_reg_file(btrfs_dev) ?
set_label_unmounted(btrfs_dev, label) :
set_label_mounted(btrfs_dev, label);
}
int btrfs_scan_block_devices(int run_ioctl)
{

2
utils.h
View File

@ -52,6 +52,8 @@ int get_device_info(int fd, u64 devid,
struct btrfs_ioctl_dev_info_args *di_args);
int get_fs_info(int fd, char *path, struct btrfs_ioctl_fs_info_args *fi_args,
struct btrfs_ioctl_dev_info_args **di_ret);
int get_label(const char *btrfs_dev);
int set_label(const char *btrfs_dev, const char *label);
char *__strncpy__null(char *dest, const char *src, size_t n);
int is_swap_device(const char *file);