From: Steinar H. Gunderson <sesse@debian.org>
Date: Mon, 17 Dec 2007 23:06:10 +0000 (+0100)
Subject: Imported Debian patch 1.1.1-11
X-Git-Tag: debian/1%1.1.1-11^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a4e12fe4050f413561acecfcd6d02e400b208c08;p=nfs-utils.git

Imported Debian patch 1.1.1-11
---

diff --git a/debian/changelog b/debian/changelog
index cfc8684..c36025b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.1.1-11) unstable; urgency=low
+
+  * 10-no-flush-blkid-cache.diff: New patch from Theodore Ts'o, removes
+    unneccessary flushing of the blkid cache, leading to lots of spurious
+    DM_* ioctls. (Closes: #431940)
+  * Sorted the list of patches in debian/patches/, and refreshed all patches
+    to fix hunk offsets.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Tue, 18 Dec 2007 00:06:10 +0100
+
 nfs-utils (1:1.1.1-10) unstable; urgency=low
 
   * 09-fix-nfsstat-option.patch: New patch, fixes so nfsstat help and man
diff --git a/debian/patches/05-ignore-quota-option.patch b/debian/patches/05-ignore-quota-option.patch
index 2985938..22c53ef 100644
--- a/debian/patches/05-ignore-quota-option.patch
+++ b/debian/patches/05-ignore-quota-option.patch
@@ -5,11 +5,11 @@ them properly, matching the man page. There are a few aliases (like
 usrjquota) that are parsed by quota, but as these are not documented
 nor seem to be widely used, they are not included.
 
-Index: nfs-utils-1.1.0/utils/mount/mount.c
+Index: nfs-utils-1.1.1/utils/mount/mount.c
 ===================================================================
---- nfs-utils-1.1.0.orig/utils/mount/mount.c
-+++ nfs-utils-1.1.0/utils/mount/mount.c
-@@ -132,6 +132,10 @@ static const struct opt_map opt_map[] = 
+--- nfs-utils-1.1.1.orig/utils/mount/mount.c
++++ nfs-utils-1.1.1/utils/mount/mount.c
+@@ -130,6 +130,10 @@ static const struct opt_map opt_map[] = 
    { "diratime", 0, 1, MS_NODIRATIME },  /* Update dir access times */
    { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
  #endif
diff --git a/debian/patches/10-no-flush-blkid-cache.diff b/debian/patches/10-no-flush-blkid-cache.diff
new file mode 100644
index 0000000..7f7a7e8
--- /dev/null
+++ b/debian/patches/10-no-flush-blkid-cache.diff
@@ -0,0 +1,13 @@
+Index: nfs-utils-1.1.1/utils/mountd/cache.c
+===================================================================
+--- nfs-utils-1.1.1.orig/utils/mountd/cache.c
++++ nfs-utils-1.1.1/utils/mountd/cache.c
+@@ -181,8 +181,6 @@ int get_uuid(char *path, char *uuid, int
+ 		if (cache == NULL)
+ 			blkid_get_cache(&cache, NULL);
+ 
+-		blkid_probe_all_new(cache);
+-
+ 		if (stat(path, &stb) != 0)
+ 			return 0;
+ 		devname = blkid_devno_to_devname(stb.st_dev);
diff --git a/debian/patches/series b/debian/patches/series
index e4310fd..e98b01f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,8 @@
-09-fix-nfsstat-option.patch
-08-clarify-unexport.patch
 02-document-debian-init-scripts.patch
 03-sm-notify-in-sbin.patch
 05-ignore-quota-option.patch
 06-gssd-manpage-typo.patch
 07-amd64-logging-segfault.patch
+08-clarify-unexport.patch
+09-fix-nfsstat-option.patch
+10-no-flush-blkid-cache.diff