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 af09129..492cc2e 100644 (file)
--- a/libcfs/include/libcfs/winnt/winnt-fs.h
+++ b/libcfs/include/libcfs/winnt/winnt-fs.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -89,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,
@@ -125,41 +127,41 @@ struct file {
 
 };
 
-#define cfs_filp_size(f)               ((f)->f_size)
-#define cfs_filp_poff(f)                (&(f)->f_pos)
-
-cfs_file_t *cfs_filp_open(const char *name, int flags, int mode, int *err);
-int cfs_filp_close(cfs_file_t *fp);
-int cfs_filp_read(cfs_file_t *fp, void *buf, size_t nbytes, loff_t *pos);
-int cfs_filp_write(cfs_file_t *fp, void *buf, size_t nbytes, loff_t *pos);
-int cfs_filp_fsync(cfs_file_t *fp);
-int cfs_get_file(cfs_file_t *fp);
-int cfs_put_file(cfs_file_t *fp);
-int cfs_file_count(cfs_file_t *fp);
-#define cfs_filp_unlink(x, y) (KdBreakPoint(),0) 
+#define filp_size(f)           ((f)->f_size)
+#define filp_poff(f)           (&(f)->f_pos)
+
+struct file *filp_open(const char *name, int flags, int mode);
+int filp_close(struct file *fp, void *id);
+int filp_read(struct file *fp, void *buf, size_t nbytes, loff_t *pos);
+int filp_write(struct file *fp, void *buf, size_t nbytes, loff_t *pos);
+int filp_fsync(struct file *fp);
+int get_file(struct file *fp);
+int fput(struct file *fp);
+int file_count(struct file *fp);
+#define cfs_filp_unlink(x, y) (KdBreakPoint(), 0)
 /*
  * CFS_FLOCK routines
  */
 
-typedef struct file_lock{
-    int         fl_type;
-    pid_t       fl_pid;
-    size_t      fl_len;
-    off_t       fl_start;
-    off_t       fl_end;
-} cfs_flock_t; 
-
-#define CFS_INT_LIMIT(x)               (~((x)1 << (sizeof(x)*8 - 1)))
-#define CFS_OFFSET_MAX                 CFS_INT_LIMIT(loff_t)
-
-#define cfs_flock_type(fl)                  ((fl)->fl_type)
-#define cfs_flock_set_type(fl, type)        do { (fl)->fl_type = (type); } while(0)
-#define cfs_flock_pid(fl)                   ((fl)->fl_pid)
-#define cfs_flock_set_pid(fl, pid)          do { (fl)->fl_pid = (pid); } while(0)
-#define cfs_flock_start(fl)                 ((fl)->fl_start)
-#define cfs_flock_set_start(fl, start)      do { (fl)->fl_start = (start); } while(0)
-#define cfs_flock_end(fl)                   ((fl)->fl_end)
-#define cfs_flock_set_end(fl, end)          do { (fl)->fl_end = (end); } while(0)
+struct file_lock {
+       int     fl_type;
+       pid_t   fl_pid;
+       size_t  fl_len;
+       off_t   fl_start;
+       off_t   fl_end;
+};
+
+#define INT_LIMIT(x)                   (~((x)1 << (sizeof(x)*8 - 1)))
+#define OFFSET_MAX                     INT_LIMIT(loff_t)
+
+#define flock_type(fl)                 ((fl)->fl_type)
+#define flock_set_type(fl, type)       do { (fl)->fl_type = (type); } while (0)
+#define flock_pid(fl)                  ((fl)->fl_pid)
+#define flock_set_pid(fl, pid)         do { (fl)->fl_pid = (pid); } while (0)
+#define flock_start(fl)                        ((fl)->fl_start)
+#define flock_set_start(fl, st)                do { (fl)->fl_start = (st); } while (0)
+#define flock_end(fl)                  ((fl)->fl_end)
+#define flock_set_end(fl, end)         do { (fl)->fl_end = (end); } while (0)
 
 #define ATTR_MODE       0x0001
 #define ATTR_UID        0x0002
@@ -238,20 +240,20 @@ struct inode {
         int             i_uid;
         int             i_gid;
         __u32           i_flags;
-        cfs_mutex_t     i_sem;
+       struct mutex    i_sem;
         void *          i_priv;
 };
 
 #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);
@@ -274,19 +276,19 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
     inode->i_size = i_size;
 }
 
-typedef struct cfs_kstatfs {
-        u64     f_type;
-        long    f_bsize;
-        u64     f_blocks;
-        u64     f_bfree;
-        u64     f_bavail;
-        u64     f_files;
-        u64     f_ffree;
-        __u32   f_fsid;
-        long    f_namelen;
-        long    f_frsize;
-        long    f_spare[5];
-} cfs_kstatfs_t;
+struct kstatfs {
+       u64     f_type;
+       long    f_bsize;
+       u64     f_blocks;
+       u64     f_bfree;
+       u64     f_bavail;
+       u64     f_files;
+       u64     f_ffree;
+       __u32   f_fsid;
+       long    f_namelen;
+       long    f_frsize;
+       long    f_spare[5];
+};
 
 struct super_block {
         void *  s_fs_info;
@@ -467,16 +469,12 @@ UnmapViewOfFile(
 
 #endif /* __KERNEL__ */
 
-typedef struct {
+struct dentry {
        void    *d;
-} cfs_dentry_t;
+};
 
 /*
  *  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__*/