block-mount: remove explicit lock waits, solves some potential race conditions

SVN-Revision: 27226

package/block-mount/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=block-mount
 PKG_VERSION:=0.2.0
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 include $(INCLUDE_DIR)/package.mk
 

package/block-mount/files/block.sh

@@ -121,7 +121,6 @@ config_create_swap_fstab_entry() {
 	local fstabnew
 
 	mkdir -p /var/lock
-	lock -w /var/lock/fstab.lck && {
 	lock /var/lock/fstab.lck
 	fstabnew="$(mktemp -t '.fstab.XXXXXXXX')"
 	cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" >>"$fstabnew"
@@ -130,7 +129,6 @@ config_create_swap_fstab_entry() {
 	rm -f $fstabnew
 	lock -u /var/lock/fstab.lck
 }
-}
 
 config_create_mount_fstab_entry() {
 	local device="$1"
@@ -146,7 +144,6 @@ config_create_mount_fstab_entry() {
 	local fstabnew
 
 	mkdir -p /var/lock
-	lock -w /var/lock/fstab.lck && {
 	lock /var/lock/fstab.lck
 	fstabnew="$(mktemp -t '.fstab.XXXXXXXX')"
 	cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" | grep -v "$target" >>"$fstabnew"
@@ -155,7 +152,6 @@ config_create_mount_fstab_entry() {
 	rm -f $fstabnew
 	lock -u /var/lock/fstab.lck
 }
-}
 
 libmount_find_token() {
 	local token="$1"

package/block-mount/files/fstab.init

@@ -66,13 +66,11 @@ start() {
 
 	config_load fstab
 	mkdir -p /var/lock
-	lock -w /var/lock/fstab.lck && {
 	lock /var/lock/fstab.lck
 	[ -e /tmp/fstab ] || {
 		echo '# WARNING: this is an auto generated file, please use uci to set defined filesystems' > /tmp/fstab
 	}
 	lock -u /var/lock/fstab.lck
-	}
 	config_foreach do_swapon swap
 	config_foreach do_mount mount
 	config_foreach do_swapon swap  # do swap a second time so that swap on filesystems is enabled