Change module data to use "info@clusterfs.com" email per Peter.

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index 4893907..f1e45aa 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -413,7 +413,7 @@ static inline int obd_cancel(struct lustre_handle *conn, __u32 mode,
         struct obd_export *export;
         OBD_CHECK_SETUP(conn, export);
         OBD_CHECK_OP(export->export_obd,cancel);
-        
+
         rc = OBP(export->export_obd, cancel)(conn, mode, lockh);
         RETURN(rc);
 }
@@ -436,7 +436,7 @@ static inline int obdo_has_inline(struct obdo *obdo)
 #ifdef __KERNEL__
 /* support routines */
 extern kmem_cache_t *obdo_cachep;
-static __inline__ struct obdo *obdo_alloc(void)
+static inline struct obdo *obdo_alloc(void)
 {
         struct obdo *oa = NULL;
 
@@ -447,7 +447,7 @@ static __inline__ struct obdo *obdo_alloc(void)
 
         return oa;
 }
-static __inline__ void obdo_free(struct obdo *oa)
+static inline void obdo_free(struct obdo *oa)
 {
         if (!oa)
                 return;
@@ -496,7 +496,7 @@ static inline void obdo_from_iattr(struct obdo *oa, struct iattr *attr)
 static inline void iattr_from_obdo(struct iattr *attr, struct obdo *oa)
 {
         unsigned int ia_valid = oa->o_valid;
-        
+
         memset(attr, 0, sizeof(*attr));
         if (ia_valid & OBD_MD_FLATIME) {
                 attr->ia_atime = oa->o_atime;
@@ -535,7 +535,7 @@ static inline void iattr_from_obdo(struct iattr *attr, struct obdo *oa)
 /* WARNING: the file systems must take care not to tinker with
    attributes they don't manage (such as blocks). */
 
-static __inline__ void obdo_from_inode(struct obdo *dst, struct inode *src)
+static inline void obdo_from_inode(struct obdo *dst, struct inode *src)
 {
         if ( dst->o_valid & OBD_MD_FLID )
                 dst->o_id = src->i_ino;
@@ -565,7 +565,7 @@ static __inline__ void obdo_from_inode(struct obdo *dst, struct inode *src)
                 dst->o_generation = src->i_generation;
 }
 
-static __inline__ void obdo_to_inode(struct inode *dst, struct obdo *src)
+static inline void obdo_to_inode(struct inode *dst, struct obdo *src)
 {
 
         if ( src->o_valid & OBD_MD_FLID )
@@ -598,7 +598,7 @@ static __inline__ void obdo_to_inode(struct inode *dst, struct obdo *src)
 
 #endif 
 
-static __inline__ void obdo_cpy_md(struct obdo *dst, struct obdo *src)
+static inline void obdo_cpy_md(struct obdo *dst, struct obdo *src)
 {
 #ifdef __KERNEL__
         CDEBUG(D_INODE, "src obdo %Ld valid 0x%x, dst obdo %Ld\n",
@@ -644,8 +644,8 @@ static __inline__ void obdo_cpy_md(struct obdo *dst, struct obdo *src)
 
 
 /* returns FALSE if comparison (by flags) is same, TRUE if changed */
-static __inline__ int obdo_cmp_md(struct obdo *dst, struct obdo *src,
-                                  obd_flag compare)
+static inline int obdo_cmp_md(struct obdo *dst, struct obdo *src,
+                              obd_flag compare)
 {
         int res = 0;
 

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 1bf08d0..f1e2d07 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -475,7 +475,7 @@ EXPORT_SYMBOL(ldlm_lock_dump);
 EXPORT_SYMBOL(ldlm_namespace_new);
 EXPORT_SYMBOL(ldlm_namespace_free);
 
-MODULE_AUTHOR("Cluster File Systems, Inc. <braam@clusterfs.com>");
+MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Lock Management Module v0.1");
 MODULE_LICENSE("GPL");
 

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index 7f56413..3a0b3b8 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -577,7 +577,7 @@ struct obd_ops lov_obd_ops = {
 static int __init lov_init(void)
 {
         printk(KERN_INFO "Lustre Logical Object Volume driver " LOV_VERSION
-               ", phil@clusterfs.com\n");
+               ", info@clusterfs.com\n");
         return class_register_type(&lov_obd_ops, OBD_LOV_DEVICENAME);
 }
 
@@ -586,7 +586,7 @@ static void __exit lov_exit(void)
         class_unregister_type(OBD_LOV_DEVICENAME);
 }
 
-MODULE_AUTHOR("Phil Schwan <phil@clusterfs.com>");
+MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Logical Object Volume OBD driver v0.1");
 MODULE_LICENSE("GPL");
 

diff --git a/lustre/mds/mds_ext3.c b/lustre/mds/mds_ext3.c
index 8c5d9bf..3ee8489 100644 (file)
--- a/lustre/mds/mds_ext3.c
+++ b/lustre/mds/mds_ext3.c
@@ -298,7 +298,7 @@ static void __exit mds_ext3_exit(void)
         }
 }
 
-MODULE_AUTHOR("Cluster File Systems, Inc. <adilger@clusterfs.com>");
+MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre MDS ext3 Filesystem Helper v0.1");
 MODULE_LICENSE("GPL");
 

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index e18d73a..1571b33 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -1425,7 +1425,7 @@ static struct obd_ops filter_obd_ops = {
 
 static int __init obdfilter_init(void)
 {
-        printk(KERN_INFO "Filtering OBD driver  v0.001, braam@clusterfs.com\n");
+        printk(KERN_INFO "Filtering OBD driver  v0.001, info@clusterfs.com\n");
         return class_register_type(&filter_obd_ops, OBD_FILTER_DEVICENAME);
 }
 
@@ -1434,7 +1434,7 @@ static void __exit obdfilter_exit(void)
         class_unregister_type(OBD_FILTER_DEVICENAME);
 }
 
-MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
+MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Filtering OBD driver v1.0");
 MODULE_LICENSE("GPL");
 

diff --git a/lustre/obdfs/super.c b/lustre/obdfs/super.c
index ea6ffad..cbac1bd 100644 (file)
--- a/lustre/obdfs/super.c
+++ b/lustre/obdfs/super.c
@@ -479,7 +479,7 @@ int init_obdfs(void)
 {
         //int err;
 
-        printk(KERN_INFO "OBDFS v0.1, braam@stelias.com\n");
+        printk(KERN_INFO "OBDFS v0.1, info@clusterfs.com\n");
 
         obdfs_sysctl_init();
 

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 506d712..5f39ad9 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -881,7 +881,7 @@ static void __exit osc_exit(void)
         class_unregister_type(LUSTRE_OSC_NAME);
 }
 
-MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
+MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Object Storage Client (OSC) v1.0");
 MODULE_LICENSE("GPL");
 

diff --git a/lustre/ptlrpc/rpc.c b/lustre/ptlrpc/rpc.c
index f99cbc8..f23a33e 100644 (file)
--- a/lustre/ptlrpc/rpc.c
+++ b/lustre/ptlrpc/rpc.c
@@ -204,9 +204,9 @@ EXPORT_SYMBOL(lustre_msg_size);
 EXPORT_SYMBOL(lustre_unpack_msg);
 EXPORT_SYMBOL(lustre_msg_buf);
 
-MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
+MODULE_AUTHOR("Cluster File Systems, Inc <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Request Processor v1.0");
-MODULE_LICENSE("GPL"); 
+MODULE_LICENSE("GPL");
 
 module_init(ptlrpc_init);
 module_exit(ptlrpc_exit);