rules: simplify mmc RPMB handling

Simplifiy commit 82c7a9 following upstream commit 0c13be38.

We don't actually want a by-path/ symlink for MMC RPMB devices, so just add
them to the blacklist. This will prevent creating wrong by-path links and
blkid'ing those.

diff --git a/debian/patches/Set-default-polling-interval-on-removable-devices-as.patch b/debian/patches/Set-default-polling-interval-on-removable-devices-as.patch
index ba1f59997cf1cd08276ffef732e6f3c05bdfb4d1..b4880a4044c9cddb26f9a2677b09781505943240 100644 (file)
--- a/debian/patches/Set-default-polling-interval-on-removable-devices-as.patch
+++ b/debian/patches/Set-default-polling-interval-on-removable-devices-as.patch
@@ -13,7 +13,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/890592
  1 file changed, 1 insertion(+)
 
 diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 08ed1cc..939a590 100644
+index 25b44a5..890aaff 100644
 --- a/rules/60-persistent-storage.rules
 +++ b/rules/60-persistent-storage.rules
 @@ -10,6 +10,7 @@ ACTION=="remove", GOTO="persistent_storage_end"

diff --git a/debian/patches/rules-Fix-by-path-of-mmc-RPMB-partitions-and-don-t-b.patch b/debian/patches/rules-Fix-by-path-of-mmc-RPMB-partitions-and-don-t-b.patch
index 17901b5362f53c4eb00b77f822afd555c961dc82..9e9b5d92f5a3b54f2c7d522039f498ac7909419a 100644 (file)
--- a/debian/patches/rules-Fix-by-path-of-mmc-RPMB-partitions-and-don-t-b.patch
+++ b/debian/patches/rules-Fix-by-path-of-mmc-RPMB-partitions-and-don-t-b.patch
@@ -4,40 +4,28 @@ Subject: rules: Fix by-path of mmc RPMB partitions and don't blkid them
 
 Linux 3.10+ exposes RPMB (Replay Protected Memory Block) partitions of MMC
 devices [1] ; trying to read them with blkid or other unspecific means will
-cause kernel buffer I/O errors and timeouts. So don't run blkid on these.
+cause kernel buffer I/O errors and timeouts.
 
-Also ensure that /dev/disk/by-path creates proper symlinks and exposes the
--rpmb partition separately, instead of letting the "normal" partition symlink
-point to the rpbm device (this is a race condition).
+Blacklist those to prevent creating wrong by-path links and
+blkid'ing those.
 
 [1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=090d25fe224c0
 
 https://launchpad.net/bugs/1333140
 ---
- rules/60-persistent-storage.rules | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ rules/60-persistent-storage.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 475b151..08ed1cc 100644
+index 475b151..25b44a5 100644
 --- a/rules/60-persistent-storage.rules
 +++ b/rules/60-persistent-storage.rules
-@@ -53,7 +53,8 @@ KERNEL=="mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+=
+@@ -14,7 +14,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
+ SUBSYSTEM!="block", GOTO="persistent_storage_end"
  
- # by-path (parent device path)
- ENV{DEVTYPE}=="disk", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"
--ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
-+ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", KERNEL=="mmcblk[0-9]*rpmb", SYMLINK+="disk/by-path/$env{ID_PATH}-rpmb"
-+ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", KERNEL!="mmcblk[0-9]*rpmb", SYMLINK+="disk/by-path/$env{ID_PATH}"
- ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
- 
- # skip unpartitioned removable media devices from drivers which do not send "change" events
-@@ -66,6 +67,9 @@ KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DAT
- KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", \
-   IMPORT{builtin}="blkid --noraid"
- 
-+# don't try to read Replay Protected Memory Block partitions
-+KERNEL=="mmcblk[0-9]*rpmb", GOTO="persistent_storage_end"
-+
- # probe filesystem metadata of disks
- KERNEL!="sr*", IMPORT{builtin}="blkid"
+ # skip rules for inappropriate block devices
+-KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|zram*", GOTO="persistent_storage_end"
++KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|zram*|mmcblk[0-9]*rpmb", GOTO="persistent_storage_end"
  
+ # ignore partitions that span the entire disk
+ TEST=="whole_disk", GOTO="persistent_storage_end"