Branch b1_6

Release the module reference in ll_kern_mount()

b=12546
i=green
i=shadow

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 2d43623..68ca7e7 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -15,6 +15,13 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * bug fixes
 
 Severity   : normal
+Frequency  : 2.6.18 servers only
+Bugzilla   : 12546
+Description: ll_kern_mount() doesn't release the module reference
+Details    : The ldiskfs module reference count never drops down to 0
+            because ll_kern_mount() doesn't release the module reference.
+
+Severity   : normal
 Frequency  : rare
 Bugzilla   : 12470
 Description: server LBUG when using old ost_num_threads parameter

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 7e69bce..02248ac 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -497,6 +497,7 @@ ll_kern_mount(const char *fstype, int flags, const char *name, void *data)
         if (!type)
                 return ERR_PTR(-ENODEV);
         mnt = vfs_kern_mount(type, flags, name, data);
+        module_put(type->owner);
         return mnt;
 }
 #else