rebase ZFS on top of debian/0.7.11-3

[zfsonlinux.git] / zfs-patches / 0004-Fix-deadlock-between-zfs-umount-snapentry_expire.patch

diff --git a/zfs-patches/0004-Fix-deadlock-between-zfs-umount-snapentry_expire.patch b/zfs-patches/0004-Fix-deadlock-between-zfs-umount-snapentry_expire.patch
index 5c090d335de1308a52918e22e43a6445b3ab7f9d..9516cec348c5f2e5255f67f19f4a03dd8029e0fa 100644 (file)
--- a/zfs-patches/0004-Fix-deadlock-between-zfs-umount-snapentry_expire.patch
+++ b/zfs-patches/0004-Fix-deadlock-between-zfs-umount-snapentry_expire.patch
@@ -20,13 +20,15 @@ Closes #7751
 Closes #7752
 
 (Cherry-picked from fd7265c646f40e364396af5014bbb83e809e124a)
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
  module/zfs/zfs_ctldir.c | 11 +++++------
  1 file changed, 5 insertions(+), 6 deletions(-)
 
 diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
-index 3b5fb196..14af55c4 100644
+index 98897fe6..0ab5b4f0 100644
 --- a/module/zfs/zfs_ctldir.c
 +++ b/module/zfs/zfs_ctldir.c
 @@ -358,8 +358,6 @@ snapentry_expire(void *data)