---

yaml --- r: 361015 b: refs/heads/master c: 9141770 h: refs/heads/master i: 361013: b1d19de 361011: 266f19a 361007: a7d0154 v: v3
git-mirror · Mar 7, 2013 · 6341b25 · 6341b25
1 parent ab84c20
commit 6341b25
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f78e0351394052e1a6293e175825eb5c7869507
+refs/heads/master: 9141770548d529b9d32d5b08d59b65ee65afe0d4
diff --git a/trunk/fs/devpts/inode.c b/trunk/fs/devpts/inode.c
@@ -510,7 +510,6 @@ static struct file_system_type devpts_fs_type = {
 	.fs_flags	= FS_USERNS_MOUNT | FS_USERNS_DEV_MOUNT,
 #endif
 };
-MODULE_ALIAS_FS("devpts");
 
 /*
  * The normal naming convention is simply /dev/pts/<number>; this conforms

diff --git a/trunk/fs/ocfs2/super.c b/trunk/fs/ocfs2/super.c
@@ -1266,6 +1266,7 @@ static struct file_system_type ocfs2_fs_type = {
 	.fs_flags       = FS_REQUIRES_DEV|FS_RENAME_DOES_D_MOVE,
 	.next           = NULL
 };
+MODULE_ALIAS_FS("ocfs2");
 
 static int ocfs2_check_set_options(struct super_block *sb,
 				   struct mount_options *options)
-Original file line number
+Diff line change
@@ Expand Up / @@ -510,7 +510,6 @@ static struct file_system_type devpts_fs_type = { @@
     	.fs_flags	= FS_USERNS_MOUNT | FS_USERNS_DEV_MOUNT,
     #endif
     };
-    MODULE_ALIAS_FS("devpts");
     /*
      * The normal naming convention is simply /dev/pts/<number>; this conforms
@@ Expand Down @@