2016-06-22 10:32:01 -06:00
|
|
|
/* Copyright (C) 2016 Mike Fleetwood
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2016-10-18 16:45:28 -06:00
|
|
|
#include "BlockSpecial.h"
|
2016-06-22 10:32:01 -06:00
|
|
|
|
|
|
|
#include <glibmm/ustring.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
Include sys/sysmacros.h for major and minor macros (#776173)
Glibc 2.25 is deprecating <sys/types.h> including <sys/sysmacros.h>.
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=dbab6577c6684c62bd2521c1c29dc25c3cac966f
Deprecate inclusion of <sys/sysmacros.h> by <sys/types.h>
Building on Fedora Rawhide with Glibc 2.24.90 produces these warnings:
BlockSpecial.cc:64:13: warning: In the GNU C Library, "major" is defined
by <sys/sysmacros.h>. For historical compatibility, it is
currently defined by <sys/types.h> as well, but we plan to
remove this soon. To use "major", include <sys/sysmacros.h>
directly. If you did not intend to use a system-defined macro
"major", you should undefine it after including <sys/types.h>.
m_major = major( sb.st_rdev );
^~~~~~~~~~~~~~~~~~~~
BlockSpecial.cc:65:13: warning: In the GNU C Library, "minor" is defined
by <sys/sysmacros.h>. For historical compatibility, it is
currently defined by <sys/types.h> as well, but we plan to
remove this soon. To use "minor", include <sys/sysmacros.h>
directly. If you did not intend to use a system-defined macro
"minor", you should undefine it after including <sys/types.h>.
m_minor = minor( sb.st_rdev );
^~~~~~~~~~~~~~~~~~~~
Code needing major and minor macros should include <sys/sysmacros.h>
directly. As both Glibc and musl-libc have always provided this header
and GParted is a Linux only application, just always include the header
and don't bother with an autoconf check for its existence.
Bug 776173 - Missing sys/sysmacros.h #include, needed for experimental
glibc versions
2016-12-16 09:22:57 -07:00
|
|
|
#include <sys/sysmacros.h>
|
2016-06-22 10:32:01 -06:00
|
|
|
#include <unistd.h>
|
2016-07-12 01:05:53 -06:00
|
|
|
#include <map>
|
2016-06-22 10:32:01 -06:00
|
|
|
|
|
|
|
namespace GParted
|
|
|
|
{
|
|
|
|
|
2016-07-12 01:05:53 -06:00
|
|
|
struct MM_Number
|
|
|
|
{
|
|
|
|
unsigned long m_major;
|
|
|
|
unsigned long m_minor;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef std::map<Glib::ustring, MM_Number> MMNumberMapping;
|
|
|
|
|
|
|
|
// Associative array caching name to major, minor number pairs
|
|
|
|
// E.g.
|
|
|
|
// mm_number_cache["/dev/sda"] = {8, 0}
|
|
|
|
// mm_number_cache["/dev/sda1"] = {8, 1}
|
|
|
|
// mm_number_cache["proc"] = {0, 0}
|
|
|
|
// mm_number_cache["sysfs"] = {0, 0}
|
|
|
|
static MMNumberMapping mm_number_cache;
|
|
|
|
|
2016-06-22 10:32:01 -06:00
|
|
|
BlockSpecial::BlockSpecial() : m_name( "" ), m_major( 0UL ), m_minor( 0UL )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
BlockSpecial::BlockSpecial( const Glib::ustring & name ) : m_name( name ), m_major( 0UL ), m_minor( 0UL )
|
|
|
|
{
|
2016-07-12 01:05:53 -06:00
|
|
|
MMNumberMapping::const_iterator mm_num_iter = mm_number_cache.find( name );
|
|
|
|
if ( mm_num_iter != mm_number_cache.end() )
|
|
|
|
{
|
|
|
|
// Use already cached major, minor pair
|
|
|
|
m_major = mm_num_iter->second.m_major;
|
|
|
|
m_minor = mm_num_iter->second.m_minor;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
MM_Number pair = {0UL, 0UL};
|
|
|
|
// Call stat(name, ...) to get the major, minor pair
|
2016-06-22 10:32:01 -06:00
|
|
|
struct stat sb;
|
|
|
|
if ( stat( name.c_str(), &sb ) == 0 && S_ISBLK( sb.st_mode ) )
|
|
|
|
{
|
|
|
|
m_major = major( sb.st_rdev );
|
|
|
|
m_minor = minor( sb.st_rdev );
|
2016-07-12 01:05:53 -06:00
|
|
|
pair.m_major = m_major;
|
|
|
|
pair.m_minor = m_minor;
|
2016-06-22 10:32:01 -06:00
|
|
|
}
|
2016-07-12 01:05:53 -06:00
|
|
|
// Add new cache entry for name to major, minor pair
|
|
|
|
mm_number_cache[name] = pair;
|
2016-06-22 10:32:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
BlockSpecial::~BlockSpecial()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-07-12 01:05:53 -06:00
|
|
|
void BlockSpecial::clear_cache()
|
|
|
|
{
|
|
|
|
mm_number_cache.clear();
|
|
|
|
}
|
|
|
|
|
2016-07-12 08:04:15 -06:00
|
|
|
void BlockSpecial::register_block_special( const Glib::ustring & name,
|
|
|
|
unsigned long major, unsigned long minor )
|
|
|
|
{
|
|
|
|
MM_Number pair;
|
|
|
|
pair.m_major = major;
|
|
|
|
pair.m_minor = minor;
|
|
|
|
// Add new, or update existing, cache entry for name to major, minor pair
|
|
|
|
mm_number_cache[name] = pair;
|
|
|
|
}
|
|
|
|
|
2016-06-22 10:32:01 -06:00
|
|
|
bool operator==( const BlockSpecial & lhs, const BlockSpecial & rhs )
|
|
|
|
{
|
Fix BlockSpecial comparison (#771670)
Found that in some cases usage of active encrypted swap was not working,
but only for the first encrypted swap partition. This only failed on
the first Device Mapper device, dm-0:
# ls -l /dev/mapper/ /dev/dm-*
brw-rw---- 1 root disk 254, 0 Oct 4 20:58 /dev/dm-0
brw-rw---- 1 root disk 254, 1 Oct 4 20:58 /dev/dm-1
/dev/mapper/:
total 0
crw------- 1 root root 10,236 Oct 4 19:48 control
lrwxrwxrwx 1 root root 7 Oct 4 20:58 sdb1_crypt -> ../dm-0
lrwxrwxrwx 1 root root 7 Oct 4 20:58 sdb2_crypt -> ../dm-1
# cat /proc/swaps
Filename Type Size Used Priority
/dev/sda1 partition 1524732 92356 -1
/dev/dm-0 partition 1046524 0 -2
/dev/dm-1 partition 1046524 0 -3
Was failing because the minor number of dm-0 was 0, causing BlockSpecial
operator==() to fall back to name comparison rather than major, minor
number, and GParted name /dev/mapper/sdb1_crypt doesn't match /dev/dm-0.
Found on openSUSE and Ubuntu which don't use LVM by default and don't
already have dm-0 used as an LVM Logical Volume which GParted doesn't
support.
The LINUX ALLOCATED DEVICES document [1] says block special device 0, 0
(major, minor) is not used "reserved as null device number". (Not to
be confused with 1, 3 /dev/null the Null device). All other
non-negative pairs are valid block special device numbers. Therefore
update BlockSpecial operator==() accordingly; compare by major, minor
number when either is greater than 0 falling back to string compare
otherwise. This still fits in with the BlockSpecial() constructor using
major, minor numbers 0, 0 to represent plain files.
[1] LINUX ALLOCATED DEVICES
https://www.kernel.org/doc/Documentation/devices.txt
Bug 771670 - Usage of active encrypted swap is not shown
2016-10-05 03:49:45 -06:00
|
|
|
if ( lhs.m_major > 0UL || lhs.m_minor > 0UL )
|
2016-06-22 10:32:01 -06:00
|
|
|
// Match block special files by major, minor device numbers.
|
|
|
|
return lhs.m_major == rhs.m_major && lhs.m_minor == rhs.m_minor;
|
|
|
|
else
|
|
|
|
// For non-block special files fall back to name string compare.
|
|
|
|
return lhs.m_name == rhs.m_name;
|
|
|
|
}
|
|
|
|
|
Add BlockSpecial into mount_info and fstab_info (#767842)
On some distributions having btrfs on top of LUKS encrypted partitions,
adding a second device and removing the first device used to mount the
file system causes GParted to no longer be able to report the file
system as busy or the mount points themselves.
For example, on CentOS 7, create a single btrfs file system and mount
it. The provided /dev/mapper/sdb1_crypt name is reported, via
/proc/mounts, as the mounting device:
# cryptsetup luksFormat --force-password /dev/sdb1
# cryptsetup luksOpen /dev/sdb1 sdb1_crypt
# mkfs.btrfs -L encrypted-btrfs /dev/mapper/sdb1_crypt
# mount /dev/mapper/sdb1_crypt /mnt/1
# ls -l /dev/mapper
total 0
lrwxrwxrwx. 1 root root 7 Jul 2 14:15 centos-root -> ../dm-1
lrwxrwxrwx. 1 root root 7 Jul 2 14:15 centos-swap -> ../dm-0
crw-------. 1 root root 10, 236 Jul 2 14:15 control
lrwxrwxrwx. 1 root root 7 Jul 2 15:14 sdb1_crypt -> ../dm-2
# fgrep btrfs /proc/mounts
/dev/mapper/sdb1_crypt /mnt/1 btrfs rw,seclabel,relatime,space_cache 0 0
Add a second device to the btrfs file system:
# cryptsetup luksFormat --force-password /dev/sdb2
# cryptsetup luksOpen /dev/sdb2 sdb2_crypt
# btrfs device add /dev/mapper/sdb2_crypt /mnt/1
# ls -l /dev/mapper
...
lrwxrwxrwx. 1 root root 7 Jul 2 15:12 sdb2_crypt -> ../dm-3
# btrfs filesystem show /dev/mapper/sdb1_crypt
Label: 'encrypted-btrfs' uuid: 45d7b1ef-820c-4ef8-8abd-c70d928afb49
Total devices 2 FS bytes used 32.00KiB
devid 1 size 1022.00MiB used 12.00MiB path /dev/mapper/sdb1_crypt
devid 2 size 1022.00MiB used 0.00B path /dev/mapper/sdb2_crypt
Remove the first mounting device from the btrfs file system. Now the
non-canonical name /dev/dm-3 is reported, via /proc/mounts, as the
mounting device:
# btrfs device delete /dev/mapper/sdb1_crypt /mnt/1
# btrfs filesystem show /dev/mapper/sdb2_crypt
Label: 'encrypted-btrfs' uuid: 45d7b1ef-820c-4ef8-8abd-c70d928afb49
Total devices 1 FS bytes used 96.00KiB
devid 2 size 1022.00MiB used 144.00MiB path /dev/mapper/sdb2_crypt
# fgrep btrfs /proc/mounts
/dev/dm-3 /mnt/1 btrfs rw,seclabel,relatime,space_cache 0 0
# ls -l /dev/dm-3
brw-rw----. 1 root disk 253, 3 Jul 2 15:12 /dev/dm-3
GParted loads the mount_info mapping from /proc/mounts and with it the
/dev/dm-3 name. When GParted is determining if the encrypted btrfs file
system is mounted or getting the mount points it is using the
/dev/mapper/sdb2_crypt name. Therefore no information is found and the
file system is incorrectly reported as unmounted.
Fix by changing mount_info and fstab_info to use BlockSpecial objects
instead of strings so that matching is performed by major, minor device
numbers rather than by string compare. Note that as BlockSpecial
objects are used as the key of std::map [1] mappings operator<() [2]
needs to be provided to order the key values.
[1] std::map
http://www.cplusplus.com/reference/map/map/
[2] std::map::key_comp
http://www.cplusplus.com/reference/map/map/key_comp/
Bug 767842 - File system usage missing when tools report alternate block
device names
2016-06-25 01:29:17 -06:00
|
|
|
bool operator<( const BlockSpecial & lhs, const BlockSpecial & rhs )
|
|
|
|
{
|
|
|
|
if ( lhs.m_major == 0 && rhs.m_major == 0 && lhs.m_minor == 0 && rhs.m_minor == 0 )
|
|
|
|
// Two non-block special files are ordered by name.
|
|
|
|
return lhs.m_name < rhs.m_name;
|
|
|
|
else
|
|
|
|
// Block special files are ordered by major, minor device numbers.
|
|
|
|
return lhs.m_major < rhs.m_major || ( lhs.m_major == rhs.m_major && lhs.m_minor < rhs.m_minor );
|
|
|
|
}
|
|
|
|
|
2016-06-22 10:32:01 -06:00
|
|
|
} //GParted
|