pnfs: simplify pnfs files module autoloading

Commit Message

J. Bruce Fields July 15, 2011, 11:18 p.m. UTC

From: J. Bruce Fields <[e-mail]>

Embed the necessary alias into the module rather than waiting for
someone to add it to /etc/modprobe.conf

Signed-off-by: J. Bruce Fields <[e-mail]>
---
 fs/nfs/nfs4filelayout.c      |    2 ++
 fs/nfs/objlayout/objio_osd.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

Oops, got Trond's address wrong!

Patch

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 0bafcc9..a288abc 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -903,5 +903,7 @@  static void __exit nfs4filelayout_exit(void)
 	pnfs_unregister_layoutdriver(&filelayout_type);
 }
 
+MODULE_ALIAS("nfs-layouttype4-1");
+
 module_init(nfs4filelayout_init);
 module_exit(nfs4filelayout_exit);
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index 8ff2ea3..aba9577 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -1055,5 +1055,7 @@  objlayout_exit(void)
 	       __func__);
 }
 
+MODULE_ALIAS("nfs-layouttype4-2");
+
 module_init(objlayout_init);
 module_exit(objlayout_exit);