LU-1346 libcfs: cleanup libcfs atomic primitives

[fs/lustre-release.git] / libcfs / libcfs / winnt / winnt-fs.c

diff --git a/libcfs/libcfs/winnt/winnt-fs.c b/libcfs/libcfs/winnt/winnt-fs.c
index 9a5a2f6..4465acd 100644 (file)
--- a/libcfs/libcfs/winnt/winnt-fs.c
+++ b/libcfs/libcfs/winnt/winnt-fs.c
@@ -150,16 +150,16 @@ struct file *filp_open(const char *name, int flags, int mode, int *err)
                        return ERR_PTR(-EINVAL);
        }
 
-       AnsiString = cfs_alloc(sizeof(CHAR) * (NameLength + PrefixLength + 1),
-                               CFS_ALLOC_ZERO);
+       AnsiString = kmalloc(sizeof(CHAR) * (NameLength + PrefixLength + 1),
+                               __GFP_ZERO);
        if (NULL == AnsiString)
                return ERR_PTR(-ENOMEM);
 
        UnicodeString =
-               cfs_alloc(sizeof(WCHAR) * (NameLength + PrefixLength + 1),
-                         CFS_ALLOC_ZERO);
+               kmalloc(sizeof(WCHAR) * (NameLength + PrefixLength + 1),
+                         __GFP_ZERO);
        if (NULL == UnicodeString) {
-               cfs_free(AnsiString);
+               kfree(AnsiString);
                return ERR_PTR(-ENOMEM);
        }
 
@@ -205,19 +205,19 @@ struct file *filp_open(const char *name, int flags, int mode, int *err)
 
        /* Check the returned status of IoStatus... */
        if (!NT_SUCCESS(IoStatus.Status)) {
-               cfs_free(UnicodeString);
-               cfs_free(AnsiString);
+               kfree(UnicodeString);
+               kfree(AnsiString);
                return ERR_PTR(cfs_error_code(IoStatus.Status));
        }
 
        /* Allocate the file_t: libcfs file object */
-       fp = cfs_alloc(sizeof(*fp) + NameLength, CFS_ALLOC_ZERO);
+       fp = kmalloc(sizeof(*fp) + NameLength, __GFP_ZERO);
 
        if (NULL == fp) {
                Status = ZwClose(FileHandle);
                ASSERT(NT_SUCCESS(Status));
-               cfs_free(UnicodeString);
-               cfs_free(AnsiString);
+               kfree(UnicodeString);
+               kfree(AnsiString);
                return ERR_PTR(-ENOMEM);
        }
 
@@ -227,11 +227,11 @@ struct file *filp_open(const char *name, int flags, int mode, int *err)
     fp->f_mode  = (mode_t)mode;
     fp->f_count = 1;
 
-    /* free the memory of temporary name strings */
-    cfs_free(UnicodeString);
-    cfs_free(AnsiString);
+       /* free the memory of temporary name strings */
+       kfree(UnicodeString);
+       kfree(AnsiString);
 
-    return fp;
+       return fp;
 }
 
 
@@ -261,9 +261,9 @@ int filp_close(file_t *fp, void *id)
     Status = ZwClose(fp->f_handle);
     ASSERT(NT_SUCCESS(Status));
 
-    /* free the file flip structure */
-    cfs_free(fp);
-    return 0;
+       /* free the file flip structure */
+       kfree(fp);
+       return 0;
 }
 
 
@@ -671,18 +671,18 @@ int file_count(struct file *fp)
 
 struct dentry *dget(struct dentry *de)
 {
-    if (de) {
-        cfs_atomic_inc(&de->d_count);
-    }
-    return de;
+       if (de) {
+               atomic_inc(&de->d_count);
+       }
+       return de;
 }
 
 void dput(struct dentry *de)
 {
-    if (!de || cfs_atomic_read(&de->d_count) == 0) {
+    if (!de || atomic_read(&de->d_count) == 0) {
         return;
     }
-    if (cfs_atomic_dec_and_test(&de->d_count)) {
-        cfs_free(de);
+    if (atomic_dec_and_test(&de->d_count)) {
+       kfree(de);
     }
 }