[PATCH 2/2] maint: remove various FIXME comments [was: coreutils: FIXMEs in 2013]

[Bernhard Voelker]

On 11/29/2013 11:10 AM, Pádraig Brady wrote:
> On 11/29/2013 09:16 AM, Bernhard Voelker wrote:
>>      2       src/extent-scan.c:32:   FIXME: remove in 2013, or whenever 
>> we're pretty confident
> 
> The kernel never got this fix unfortunately.
> Therefore the FIXME comment should be removed.
> 
>>      3       src/realpath.c:54:  {"strip", no_argument, NULL, 's' /* FIXME: 
>> deprecate in 2013 or so */},
> 
> Actually debian still removes realpath(1) from coreutils
> in preference for the separate realpath package.
> I must log a bug for that.
> So we can't remove yet.
> In any case --strip is another way to think about the operation,
> so I'd be inclined to leave it in indefinitely.
> So please just remove the FIXME comment.

Thanks!

Have a nice day,
Berny

>From 738585e27e23e07ec9a8e6b2b18118c408bb7243 Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <address@hidden>
Date: Fri, 29 Nov 2013 12:18:06 +0100
Subject: [PATCH 2/2] maint: remove various FIXME comments

* src/extent-scan.c (extent_need_sync): Remove the FIXME comment about
removing the work around.  As discussed in [1], the needed FIEMAP fix
never made it into the Linux kernel.

* src/realpath.c (longopts): Remove the FIXME comment about deprecating
the --strip option as it's a valid alias for --no-symlinks option.
Also discussed in [1].

[1] http://lists.gnu.org/archive/html/coreutils/2013-11/msg00103.html
---
 src/extent-scan.c | 4 +---
 src/realpath.c    | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/extent-scan.c b/src/extent-scan.c
index 6d3032a7..5e524fa 100644
--- a/src/extent-scan.c
+++ b/src/extent-scan.c
@@ -28,9 +28,7 @@
 #include "xstrtol.h"


-/* Work around Linux kernel issues on BTRFS and EXT4 before 2.6.39.
-   FIXME: remove in 2013, or whenever we're pretty confident
-   that the offending, unpatched kernels are no longer in use.  */
+/* Work around Linux kernel issues on BTRFS and EXT4.  */
 static bool
 extent_need_sync (void)
 {
diff --git a/src/realpath.c b/src/realpath.c
index 292c8f3..233b98f 100644
--- a/src/realpath.c
+++ b/src/realpath.c
@@ -51,7 +51,7 @@ static struct option const longopts[] =
   {"relative-to", required_argument, NULL, RELATIVE_TO_OPTION},
   {"relative-base", required_argument, NULL, RELATIVE_BASE_OPTION},
   {"quiet", no_argument, NULL, 'q'},
-  {"strip", no_argument, NULL, 's' /* FIXME: deprecate in 2013 or so */},
+  {"strip", no_argument, NULL, 's'},
   {"no-symlinks", no_argument, NULL, 's'},
   {"zero", no_argument, NULL, 'z'},
   {"logical", no_argument, NULL, 'L'},
-- 
1.8.4.2