7a355379ea
get_fs_info() has been silently switching from a device to a mounted path as needed; the caller's filehandle was unexpectedly closed & reopened outside the caller's scope. Not so great. The callers do want "fdmnt" to be the filehandle for the mount point in all cases, though - the various ioctls act on this (not on an fd for the device). But switching it in the local scope of get_fs_info is incorrect; it just so happens that *usually* the fd number is unchanged. So - use the new helpers to detect when an argument is a block device, and open the the mounted path more obviously / explicitly for ioctl use, storing the filehandle in fdmnt. Then, in get_fs_info, ignore the fd completely, and use the path on the argument to determine if the caller wanted to act on just that device, or on all devices for the filesystem. Affects those commands which are documented to accept either a block device or a path: * btrfs device stats * btrfs replace start * btrfs scrub start * btrfs scrub status Signed-off-by: Eric Sandeen <sandeen@redhat.com>
67 lines
2.7 KiB
C
67 lines
2.7 KiB
C
/*
|
|
* Copyright (C) 2007 Oracle. 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.
|
|
*/
|
|
|
|
#ifndef __UTILS__
|
|
#define __UTILS__
|
|
|
|
#include "ctree.h"
|
|
|
|
#define BTRFS_MKFS_SYSTEM_GROUP_SIZE (4 * 1024 * 1024)
|
|
|
|
int make_btrfs(int fd, const char *device, const char *label,
|
|
u64 blocks[6], u64 num_bytes, u32 nodesize,
|
|
u32 leafsize, u32 sectorsize, u32 stripesize);
|
|
int btrfs_make_root_dir(struct btrfs_trans_handle *trans,
|
|
struct btrfs_root *root, u64 objectid);
|
|
int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
|
|
u64 max_block_count, int *mixed, int nodiscard);
|
|
int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
|
|
struct btrfs_root *root, int fd, char *path,
|
|
u64 block_count, u32 io_width, u32 io_align,
|
|
u32 sectorsize);
|
|
int btrfs_scan_for_fsid(struct btrfs_fs_devices *fs_devices, u64 total_devs,
|
|
int run_ioctls);
|
|
void btrfs_register_one_device(char *fname);
|
|
int btrfs_scan_one_dir(char *dirname, int run_ioctl);
|
|
int check_mounted(const char *devicename);
|
|
int check_mounted_where(int fd, const char *file, char *where, int size,
|
|
struct btrfs_fs_devices **fs_devices_mnt);
|
|
int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
|
|
int super_offset);
|
|
char *pretty_sizes(u64 size);
|
|
int get_mountpt(char *dev, char *mntpt, size_t size);
|
|
int btrfs_scan_block_devices(int run_ioctl);
|
|
u64 parse_size(char *s);
|
|
int open_file_or_dir(const char *fname);
|
|
int get_device_info(int fd, u64 devid,
|
|
struct btrfs_ioctl_dev_info_args *di_args);
|
|
int get_fs_info(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_block_device(const char *file);
|
|
int get_btrfs_mount(const char *path, char *mp, size_t mp_size);
|
|
int open_path_or_dev_mnt(const char *path);
|
|
int is_swap_device(const char *file);
|
|
/* Helper to always get proper size of the destination string */
|
|
#define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest))
|
|
|
|
#endif
|