LU-4699 libcfs: unify ERR_PTR definitions

[fs/lustre-release.git] / libcfs / include / libcfs / winnt / winnt-fs.h

diff --git a/libcfs/include/libcfs/winnt/winnt-fs.h b/libcfs/include/libcfs/winnt/winnt-fs.h
index 587c308..492cc2e 100644 (file)
--- a/libcfs/include/libcfs/winnt/winnt-fs.h
+++ b/libcfs/include/libcfs/winnt/winnt-fs.h
@@ -91,7 +91,7 @@
 
 struct file_operations
 {
-    cfs_module_t *owner;
+    struct module *owner;
     loff_t (*llseek)(struct file * file, loff_t offset, int origin);
     ssize_t (*read) (struct file * file, char * buf, size_t nbytes, loff_t *ppos);
     ssize_t (*write)(struct file * file, const char * buffer,
@@ -247,13 +247,13 @@ struct inode {
 #define I_FREEING       0x0001
 
 struct dentry {
-        cfs_atomic_t    d_count;
-        struct {
-            int         len;
-            char *      name;
-        } d_name;
-        struct inode *  d_inode;
-        struct dentry*  d_parent;
+       atomic_t    d_count;
+       struct {
+           int         len;
+           char *      name;
+       } d_name;
+       struct inode *  d_inode;
+       struct dentry*  d_parent;
 };
 
 extern struct dentry *dget(struct dentry *de);
@@ -477,8 +477,4 @@ struct dentry {
  *  misc
  */
 
-#define ERR_PTR(error) ((void *)(long_ptr_t)(error))
-#define PTR_ERR(ptr)   ((long)(long_ptr_t) (ptr))
-#define IS_ERR(ptr)    ((long)(((ulong_ptr_t) (ptr)) > (ulong_ptr_t)(-1000L)))
-
 #endif /* __LIBCFS_WINNT_CFS_FS_H__*/