From: David Zeuthen <davidz@redhat.com>
Date: Fri, 26 Aug 2011 17:09:41 +0000 (-0400)
Subject: Revert "Add nilfs2 label rename"
X-Git-Tag: upstream/2.1.2~493
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbffb083cf04da178a92f1900d12062fc1a54231;p=platform%2Fupstream%2Fudisks2.git

Revert "Add nilfs2 label rename"

This reverts commit 7a4a5e7f3ecb568a1670ec056d297e636e2a567f.
---

diff --git a/src/daemon.c b/src/daemon.c
index d46c6da..44be94f 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -395,7 +395,7 @@ static const Filesystem known_file_systems[] =
       TRUE, /* can_mount */
       TRUE, /* can_create */
       80, /* max_label_len */
-      TRUE, /* supports_label_rename */
+      FALSE, /* supports_label_rename */
       FALSE, /* supports_online_label_rename*/
       FALSE, /* supports_fsck */
       FALSE, /* supports_online_fsck */
diff --git a/src/helpers/job-change-filesystem-label.c b/src/helpers/job-change-filesystem-label.c
index bdb28c6..5b3e746 100644
--- a/src/helpers/job-change-filesystem-label.c
+++ b/src/helpers/job-change-filesystem-label.c
@@ -103,10 +103,6 @@ main (int argc,
     {
       command_line = g_strdup_printf ("ntfslabel %s \"%s\"", device, new_label);
     }
-  else if (strcmp (fstype, "nilfs2") == 0)
-    {
-      command_line = g_strdup_printf ("nilfs-tune -L %s \"%s\"", new_label, device);
-    }
   else
     {
       g_printerr ("fstype %s not supported\n", fstype);
diff --git a/tests/run b/tests/run
index bc27cc9..d320333 100755
--- a/tests/run
+++ b/tests/run
@@ -590,8 +590,8 @@ class FS(UDisksTestCase):
                 self.assertEqual(fs[3], type != 'swap') # can_mount
                 self.assert_(fs[4]) # can_create
                 supports_label_rename = fs[6]
-                # minix does not support labels; EXFAIL: swap, btrfs don't have a program for it
-                self.assertEqual(supports_label_rename, type not in ('btrfs', 'minix', 'swap'))
+                # minix does not support labels; EXFAIL: swap, btrfs, nilfs2 don't have a program for it
+                self.assertEqual(supports_label_rename, type not in ('nilfs2', 'btrfs', 'minix', 'swap'))
                 break
         else:
             self.fail('KnownFilesystems does not contain ' + type)