libmount: remove support for deleted mount table entries

The "(deleted)" suffix has been originally used by kernel for deleted
mountpoints. Since kernel commit 9d4d65748a5ca26ea8650e50ba521295549bf4e3
(Dec 2014) kernel does not use this suffix for mount stuff in /proc at
all. Let's remove this support from libmount too.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt
index 7961dd420252b8321a8b0d8b021f46464fde5d36..097e2f06630e986f1379980d88e51afb4612b70b 100644 (file)
--- a/libmount/docs/libmount-sections.txt
+++ b/libmount/docs/libmount-sections.txt
@@ -246,7 +246,6 @@ mnt_fs_get_userdata
 mnt_fs_get_user_options
 mnt_fs_get_vfs_options
 mnt_fs_get_vfs_options_all
-mnt_fs_is_deleted
 mnt_fs_is_kernel
 mnt_fs_is_netfs
 mnt_fs_is_pseudofs

diff --git a/libmount/src/fs.c b/libmount/src/fs.c
index 163f70bd3a66c650e4913aece6b90f854a296015..b44d310ee2b7cfefb170e4810194df92452636d1 100644 (file)
--- a/libmount/src/fs.c
+++ b/libmount/src/fs.c
@@ -651,17 +651,6 @@ int mnt_fs_is_regularfs(struct libmnt_fs *fs)
                 || mnt_fs_is_swaparea(fs));
 }
 
-/**
- * mnt_fs_is_deleted:
- * @fs: filesystem
- *
- * Returns: 1 if the filesystem target is a marked as deleted by kernel
- */
-int mnt_fs_is_deleted(struct libmnt_fs *fs)
-{
-       return mnt_fs_get_flags(fs) & MNT_FS_DELETED;
-}
-
 /**
  * mnt_fs_get_fstype:
  * @fs: fstab/mtab/mountinfo entry pointer

diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index a96778754c90494859a1019a754c67a9916b1bb3..3bcf746828a4c3437793bd5ab969012e8959f100 100644 (file)
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -512,7 +512,6 @@ extern int mnt_fs_match_options(struct libmnt_fs *fs, const char *options);
 extern int mnt_fs_print_debug(struct libmnt_fs *fs, FILE *file);
 
 extern int mnt_fs_is_kernel(struct libmnt_fs *fs);
-extern int mnt_fs_is_deleted(struct libmnt_fs *fs);
 extern int mnt_fs_is_swaparea(struct libmnt_fs *fs);
 extern int mnt_fs_is_netfs(struct libmnt_fs *fs);
 extern int mnt_fs_is_pseudofs(struct libmnt_fs *fs);

diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym
index 15b738394c7000c1532d18c0fe96b0bea16d302a..aa96091b1abcb4c5e5b871037984a86f61ade774 100644 (file)
--- a/libmount/src/libmount.sym
+++ b/libmount/src/libmount.sym
@@ -365,5 +365,4 @@ MOUNT_2_37 {
 
 MOUNT_2_38 {
        mnt_fs_is_regularfs;
-       mnt_fs_is_deleted;
 } MOUNT_2_37;

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index a4e1c6206984fcfbd45a9ea126455b35c05e4db4..b47640daac54e9ff1cfd60d913cd27b9623815e0 100644 (file)
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -228,7 +228,6 @@ struct libmnt_fs {
 #define MNT_FS_SWAP    (1 << 3) /* swap device */
 #define MNT_FS_KERNEL  (1 << 4) /* data from /proc/{mounts,self/mountinfo} */
 #define MNT_FS_MERGED  (1 << 5) /* already merged data from /run/mount/utab */
-#define MNT_FS_DELETED (1 << 6) /* target path in mountinfo contains "(deleted)" */
 
 /*
  * mtab/fstab/mountinfo file

diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index d94233ca9f63e2ffd401edb4196b93465334df3d..4407f9c9c7652727646d6a33c862b2495554e6b7 100644 (file)
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -227,13 +227,6 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, const char *s)
                goto fail;
        }
 
-       /* remove "\040(deleted)" suffix */
-       p = (char *) endswith(fs->target, PATH_DELETED_SUFFIX);
-       if (p && *p) {
-               *p = '\0';
-               fs->flags |= MNT_FS_DELETED;
-       }
-
        s = skip_separator(s);
 
        /* (6) vfs options (fs-independent) */

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 4fcd117004cf48a81ebee3d8e2db78eea1763655..1c19d608b4e05faf2c3d4062531d706d8c2a4a19 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -55,7 +55,6 @@
 enum {
        COL_ACTION,
        COL_AVAIL,
-       COL_DELETED,
        COL_FREQ,
        COL_FSROOT,
        COL_FSTYPE,
@@ -103,7 +102,6 @@ struct colinfo {
 static struct colinfo infos[] = {
        [COL_ACTION]       = { "ACTION",         10, SCOLS_FL_STRICTWIDTH, N_("action detected by --poll") },
        [COL_AVAIL]        = { "AVAIL",           5, SCOLS_FL_RIGHT, N_("filesystem size available") },
-       [COL_DELETED]      = { "DELETED",         1, SCOLS_FL_RIGHT, N_("filesystem target marked as deleted") },
        [COL_FREQ]         = { "FREQ",            1, SCOLS_FL_RIGHT, N_("dump(8) period in days [fstab only]") },
        [COL_FSROOT]       = { "FSROOT",       0.25, SCOLS_FL_NOEXTREMES, N_("filesystem root") },
        [COL_FSTYPE]       = { "FSTYPE",       0.10, SCOLS_FL_TRUNC, N_("filesystem type") },
@@ -677,9 +675,6 @@ static char *get_data(struct libmnt_fs *fs, int num)
                if (!mnt_fs_is_kernel(fs))
                        xasprintf(&str, "%d", mnt_fs_get_passno(fs));
                break;
-       case COL_DELETED:
-               str = xstrdup(mnt_fs_is_deleted(fs) ? "1" : "0");
-               break;
        default:
                break;
        }
@@ -1033,9 +1028,6 @@ static int match_func(struct libmnt_fs *fs,
                        return rc;
        }
 
-       if ((flags & FL_DELETED) && !mnt_fs_is_deleted(fs))
-               return rc;
-
        return !rc;
 }
 
@@ -1304,7 +1296,6 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -b, --bytes            print sizes in bytes rather than in human readable format\n"), out);
        fputs(_(" -C, --nocanonicalize   don't canonicalize when comparing paths\n"), out);
        fputs(_(" -c, --canonicalize     canonicalize printed paths\n"), out);
-       fputs(_("     --deleted          print filesystems with mountpoint marked as deleted\n"), out);
        fputs(_(" -D, --df               imitate the output of df(1)\n"), out);
        fputs(_(" -d, --direction <word> direction of search, 'forward' or 'backward'\n"), out);
        fputs(_(" -e, --evaluate         convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
@@ -1373,8 +1364,7 @@ int main(int argc, char *argv[])
                FINDMNT_OPT_PSEUDO,
                FINDMNT_OPT_REAL,
                FINDMNT_OPT_VFS_ALL,
-               FINDMNT_OPT_SHADOWED,
-               FINDMNT_OPT_DELETED,
+               FINDMNT_OPT_SHADOWED
        };
 
        static const struct option longopts[] = {
@@ -1382,7 +1372,6 @@ int main(int argc, char *argv[])
                { "ascii",          no_argument,       NULL, 'a'                 },
                { "bytes",          no_argument,       NULL, 'b'                 },
                { "canonicalize",   no_argument,       NULL, 'c'                 },
-               { "deleted",        no_argument,       NULL, FINDMNT_OPT_DELETED },
                { "direction",      required_argument, NULL, 'd'                 },
                { "df",             no_argument,       NULL, 'D'                 },
                { "evaluate",       no_argument,       NULL, 'e'                 },
@@ -1601,9 +1590,6 @@ int main(int argc, char *argv[])
                case FINDMNT_OPT_SHADOWED:
                        flags |= FL_SHADOWED;
                        break;
-               case FINDMNT_OPT_DELETED:
-                       flags |= FL_DELETED;
-                       break;
                case 'h':
                        usage();
                case 'V':
@@ -1776,9 +1762,6 @@ int main(int argc, char *argv[])
                        case COL_TID:
                                scols_column_set_json_type(cl, SCOLS_JSON_NUMBER);
                                break;
-                       case COL_DELETED:
-                               scols_column_set_json_type(cl, SCOLS_JSON_BOOLEAN);
-                               break;
                        default:
                                if (fl & SCOLS_FL_WRAP)
                                        scols_column_set_json_type(cl, SCOLS_JSON_ARRAY_STRING);