libext2fs/ismounted.c: check open(O_EXCL) before mntent file
PATCH 1/1 libext2fs/ismounted.c: check open(O_EXCL) before mntent file
Currently the ext2fs_check_mount_point() will use the open(O_EXCL) check on linux after all the other checks are done. However it is not necessary to check mntent if open(O_EXCL) succeeds because it means that the device is not mounted.
Moreover the commit ea4d53b7 introduced a regression where a following set of commands fails:
vgcreate mygroup /dev/sda
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4 /dev/mygroup/lvol0
mount /dev/mygroup/lvol0 /mnt
lvrename /dev/mygroup/lvol0 /dev/mygroup/lvol1
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4 /dev/mygroup/lvol0 <<<--- This fails
It fails because it thinks that /dev/mygroup/lvol0 is mounted because the device name in /proc/mounts is not updated following the lvrename.
Move the open(O_EXCL) check before the mntent check and return immediatelly if the device is not busy.
--- lib/ext2fs/ismounted.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-)
lib/ext2fs/ismounted.c +26 -15
@@ -352,6 +352,7 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags, char *mtpt, int mtlen) {errcode_t retval =0 ; +int busy =0 ;if (getenv ("EXT2FS_PRETEND_RO_MOUNT" )) { *mount_flags =EXT2_MF_MOUNTED |EXT2_MF_READONLY ;
@@ -366,6 +367,29 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,return 0 ; } +#ifdef __linux__/* This only works on Linux 2.6+ systems */ + { +struct stat st_buf; + +if (stat (device, &st_buf) ==0 && +ext2fsP_is_disk_device (st_buf.st_mode)) { +int fd =open (device,O_RDONLY |O_EXCL ); + +if (fd >=0 ) { +/* +* The device is not busy so it's +* definitelly not mounted. No need to +* to perform any more checks. +*/ +close (fd); + *mount_flags =0 ; +return 0 ; + }else if (errno ==EBUSY ) + busy =1 ; + } + } +#endif +if (is_swap_device (device)) { *mount_flags =EXT2_MF_MOUNTED |EXT2_MF_SWAP ;strncpy (mtpt,"<swap>" , mtlen);
@@ -386,21 +410,8 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,if (retval)return retval; -#ifdef __linux__/* This only works on Linux 2.6+ systems */ - { -struct stat st_buf; - -if (stat (device, &st_buf) ==0 && -ext2fsP_is_disk_device (st_buf.st_mode)) { -int fd =open (device,O_RDONLY |O_EXCL ); - -if (fd >=0 ) -close (fd); -else if (errno ==EBUSY ) - *mount_flags |=EXT2_MF_BUSY ; - } - } -#endif +if (busy) + *mount_flags |=EXT2_MF_BUSY ;return 0 ; }
Signature · 1 line
2.21.1
Quoted 27 lines · Lukas Czerner
Currently the
ext2fs_check_mount_point()will use theopen(O_EXCL)check on linux after all the other checks are done. However it is not necessary to check mntent ifopen(O_EXCL)succeeds because it means that the device is not mounted.Moreover the commit
ea4d53b7introduced a regression where a following set of commands fails:vgcreate mygroup
/dev/sda
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4/dev/mygroup/lvol0
mount/dev/mygroup/lvol0/mnt
lvrename/dev/mygroup/lvol0/dev/mygroup/lvol1
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4/dev/mygroup/lvol0<<<--- This failsIt fails because it thinks that
/dev/mygroup/lvol0is mounted because the device name in/proc/mountsis not updated following the lvrename.Move the
open(O_EXCL)check before the mntent check and return immediatelly if the device is not busy.Fixes ea4d53b7 ("libext2fs/ismounted.c: check device id in advance to skip false device names")Signed-off-by Lukas Czerner <[email protected]>Reported-by Zdenek Kabelac <[email protected]>Reported-by Karel Zak <[email protected]>---
...
lib/ext2fs/ismounted.c errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags, · line 388
Quoted 11 lines
lib/ext2fs/ismounted.c +11
-0+if (fd >=0 ) { +/* +* The device is not busy so it's +* definitelly not mounted. No need to +* to perform any more checks. +*/ +close (fd); + *mount_flags =0 ; +return 0 ; + }else if (errno ==EBUSY ) + busy =1 ;
^ I think you are supposed to use {} for the 'else if'
branch too, once the first branch uses it
Other than the small coding style above, which depends on maintainer, the code looks ok, and you can add:
Cheers
Quoted 34 lines
lib/ext2fs/ismounted.c +6
-15+ } + } +#endif +if (is_swap_device (device)) { *mount_flags =EXT2_MF_MOUNTED |EXT2_MF_SWAP ;strncpy (mtpt,"<swap>" , mtlen);@@ -386,21 +410,8 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,if (retval)return retval; -#ifdef __linux__/* This only works on Linux 2.6+ systems */ - { -struct stat st_buf; - -if (stat (device, &st_buf) ==0 && -ext2fsP_is_disk_device (st_buf.st_mode)) { -int fd =open (device,O_RDONLY |O_EXCL ); - -if (fd >=0 ) -close (fd); -else if (errno ==EBUSY ) - *mount_flags |=EXT2_MF_BUSY ; - } - } -#endif +if (busy) + *mount_flags |=EXT2_MF_BUSY ;return 0 ; }Signature · 1 line
2.21.1
Signature · 1 line
Carlos
PATCH v2 1/1 libext2fs/ismounted.c: check open(O_EXCL) before mntent file
In reply to Lukas CzernerCurrently the ext2fs_check_mount_point() will use the open(O_EXCL) check on linux after all the other checks are done. However it is not necessary to check mntent if open(O_EXCL) succeeds because it means that the device is not mounted.
Moreover the commit ea4d53b7 introduced a regression where a following set of commands fails:
vgcreate mygroup /dev/sda
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4 /dev/mygroup/lvol0
mount /dev/mygroup/lvol0 /mnt
lvrename /dev/mygroup/lvol0 /dev/mygroup/lvol1
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4 /dev/mygroup/lvol0 <<<--- This fails
It fails because it thinks that /dev/mygroup/lvol0 is mounted because the device name in /proc/mounts is not updated following the lvrename.
Move the open(O_EXCL) check before the mntent check and return immediatelly if the device is not busy.
--- lib/ext2fs/ismounted.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-)
lib/ext2fs/ismounted.c +27 -15
@@ -352,6 +352,7 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags, char *mtpt, int mtlen) {errcode_t retval =0 ; +int busy =0 ;if (getenv ("EXT2FS_PRETEND_RO_MOUNT" )) { *mount_flags =EXT2_MF_MOUNTED |EXT2_MF_READONLY ;
@@ -366,6 +367,30 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,return 0 ; } +#ifdef __linux__/* This only works on Linux 2.6+ systems */ + { +struct stat st_buf; + +if (stat (device, &st_buf) ==0 && +ext2fsP_is_disk_device (st_buf.st_mode)) { +int fd =open (device,O_RDONLY |O_EXCL ); + +if (fd >=0 ) { +/* +* The device is not busy so it's +* definitelly not mounted. No need to +* to perform any more checks. +*/ +close (fd); + *mount_flags =0 ; +return 0 ; + }else if (errno ==EBUSY ) { + busy =1 ; + } + } + } +#endif +if (is_swap_device (device)) { *mount_flags =EXT2_MF_MOUNTED |EXT2_MF_SWAP ;strncpy (mtpt,"<swap>" , mtlen);
@@ -386,21 +411,8 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,if (retval)return retval; -#ifdef __linux__/* This only works on Linux 2.6+ systems */ - { -struct stat st_buf; - -if (stat (device, &st_buf) ==0 && -ext2fsP_is_disk_device (st_buf.st_mode)) { -int fd =open (device,O_RDONLY |O_EXCL ); - -if (fd >=0 ) -close (fd); -else if (errno ==EBUSY ) - *mount_flags |=EXT2_MF_BUSY ; - } - } -#endif +if (busy) + *mount_flags |=EXT2_MF_BUSY ;return 0 ; }
Signature · 1 line
2.21.1
Theodore Y. Ts'o
AppliedQuoted 19 lines · Lukas Czerner
Currently the
ext2fs_check_mount_point()will use theopen(O_EXCL)check on linux after all the other checks are done. However it is not necessary to check mntent ifopen(O_EXCL)succeeds because it means that the device is not mounted.Moreover the commit
ea4d53b7introduced a regression where a following set of commands fails:vgcreate mygroup
/dev/sda
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4/dev/mygroup/lvol0
mount/dev/mygroup/lvol0/mnt
lvrename/dev/mygroup/lvol0/dev/mygroup/lvol1
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4/dev/mygroup/lvol0<<<--- This failsIt fails because it thinks that
/dev/mygroup/lvol0is mounted because the device name in/proc/mountsis not updated following the lvrename.
Quoted 8 lines
Move the
open(O_EXCL)check before the mntent check and return immediatelly if the device is not busy.Fixes ea4d53b7 ("libext2fs/ismounted.c: check device id in advance to skip false device names")Signed-off-by Lukas Czerner <[email protected]>Reported-by Zdenek Kabelac <[email protected]>Reported-by Karel Zak <[email protected]>Reviewed-by Carlos Maiolino <[email protected]>
Applied, thanks.
- Ted