Staging: lustre: module: Replace function calls

[cascardo/linux.git] / drivers / staging / lustre / lustre / libcfs / module.c

diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index 50e8fd2..96d9d46 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -62,7 +62,7 @@
 #include "../../include/linux/lnet/lnet.h"
 #include "tracefile.h"
 
-MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Portals v3.1");
 MODULE_LICENSE("GPL");
 
@@ -319,7 +319,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a
        struct libcfs_ioctl_data *data;
        int err = 0;
 
-       LIBCFS_ALLOC_GFP(buf, 1024, GFP_IOFS);
+       LIBCFS_ALLOC_GFP(buf, 1024, GFP_KERNEL);
        if (buf == NULL)
                return -ENOMEM;
 
@@ -392,7 +392,7 @@ static int __proc_dobitmasks(void *data, int write,
        } else {
                rc = cfs_trace_copyin_string(tmpstr, tmpstrlen, buffer, nob);
                if (rc < 0) {
-                       cfs_trace_free_string_buffer(tmpstr, tmpstrlen);
+                       kfree(tmpstr);
                        return rc;
                }
 
@@ -402,7 +402,7 @@ static int __proc_dobitmasks(void *data, int write,
                        *mask |= D_EMERG;
        }
 
-       cfs_trace_free_string_buffer(tmpstr, tmpstrlen);
+       kfree(tmpstr);
        return rc;
 }