marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: remove uneccessary subvol name check for subvol deletion 

When we want to delete a subvol, we first check to see whether it is
a subvolume or not. After the check, we are sure that it is a valid
subvol, don't have to check its name.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
[removed unused variable 'len']
Signed-off-by: David Sterba <dsterba@suse.cz>
master
Gui Hecheng 2014-12-18 11:32:35 +08:00 committed by David Sterba
parent 6eafa191c0
commit 3d47cc9ae1
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmds-subvolume.c
View File

@ -208,7 +208,7 @@ static const char * const cmd_subvol_delete_usage[] = {
static int cmd_subvol_delete(int argc, char **argv)
{
int res, len, e, ret = 0;
int res, e, ret = 0;
int cnt;
int fd = -1;
struct btrfs_ioctl_vol_args args;
@ -287,21 +287,6 @@ again:
vname = basename(dupvname);
free(cpath);
if (!test_issubvolname(vname)) {
fprintf(stderr, "ERROR: incorrect subvolume name '%s'\n",
vname);
ret = 1;
goto out;
}
len = strlen(vname);
if (len == 0 || len >= BTRFS_VOL_NAME_MAX) {
fprintf(stderr, "ERROR: snapshot name too long '%s'\n",
vname);
ret = 1;
goto out;
}
fd = open_file_or_dir(dname, &dirstream);
if (fd < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n", dname);