* Removed unused libcfs cfs_rdev_{major,minor} etc.

diff --git a/lnet/include/libcfs/darwin/darwin-fs.h b/lnet/include/libcfs/darwin/darwin-fs.h
index 5eed9ef..9091a24 100644 (file)
--- a/lnet/include/libcfs/darwin/darwin-fs.h
+++ b/lnet/include/libcfs/darwin/darwin-fs.h
@@ -168,12 +168,6 @@ static inline struct posix_acl * posix_acl_dup(struct posix_acl *acl)
         return acl;
 }
 
-/*
- * portable UNIX device file identification.
- */
-
-typedef dev_t cfs_rdev_t;
-
 #else  /* !__KERNEL__ */
 
 typedef struct file cfs_file_t;

diff --git a/lnet/include/libcfs/libcfs.h b/lnet/include/libcfs/libcfs.h
index 4c337a4..a617f31 100644 (file)
--- a/lnet/include/libcfs/libcfs.h
+++ b/lnet/include/libcfs/libcfs.h
@@ -565,36 +565,6 @@ enum cfs_alloc_page_flags {
 };
 
 /*
- * portable UNIX device file identification. (This is not _very_
- * portable. Probably makes no sense for Windows.)
- */
-/*
- * Platform defines
- *
- * cfs_rdev_t
- */
-
-typedef unsigned int cfs_major_nr_t;
-typedef unsigned int cfs_minor_nr_t;
-
-/*
- * Defined by platform.
- */
-cfs_rdev_t     cfs_rdev_build(cfs_major_nr_t major, cfs_minor_nr_t minor);
-cfs_major_nr_t cfs_rdev_major(cfs_rdev_t rdev);
-cfs_minor_nr_t cfs_rdev_minor(cfs_rdev_t rdev);
-
-/*
- * Generic on-wire rdev format.
- */
-
-typedef __u32 cfs_wire_rdev_t;
-
-cfs_wire_rdev_t cfs_wire_rdev_build(cfs_major_nr_t major, cfs_minor_nr_t minor);
-cfs_major_nr_t  cfs_wire_rdev_major(cfs_wire_rdev_t rdev);
-cfs_minor_nr_t  cfs_wire_rdev_minor(cfs_wire_rdev_t rdev);
-
-/*
  * Drop into debugger, if possible. Implementation is provided by platform.
  */
 

diff --git a/lnet/include/libcfs/linux/linux-fs.h b/lnet/include/libcfs/linux/linux-fs.h
index ced39b8..fa162c0 100644 (file)
--- a/lnet/include/libcfs/linux/linux-fs.h
+++ b/lnet/include/libcfs/linux/linux-fs.h
@@ -76,12 +76,6 @@ typedef struct file_lock cfs_flock_t;
 
 ssize_t cfs_user_write (cfs_file_t *filp, const char *buf, size_t count, loff_t *offset);
 
-/*
- * portable UNIX device file identification.
- */
-
-typedef dev_t cfs_rdev_t;
-
 #endif
 
 #endif

diff --git a/lnet/include/libcfs/user-prim.h b/lnet/include/libcfs/user-prim.h
index d182041..e7c8cd1 100644 (file)
--- a/lnet/include/libcfs/user-prim.h
+++ b/lnet/include/libcfs/user-prim.h
@@ -277,14 +277,6 @@ static inline int cfs_psdev_deregister(cfs_psdev_t *foo)
         return 0;
 }
 
-/*
- * portable UNIX device file identification.
- */
-
-typedef unsigned int cfs_rdev_t;
-// typedef unsigned long long kdev_t;
-/*
- */
 #define cfs_lock_kernel()               do {} while (0)
 #define cfs_sigfillset(l) do {}         while (0)
 #define cfs_recalc_sigpending(l)        do {} while (0)

diff --git a/lnet/include/libcfs/winnt/winnt-fs.h b/lnet/include/libcfs/winnt/winnt-fs.h
index 6280b93..5be0458 100644 (file)
--- a/lnet/include/libcfs/winnt/winnt-fs.h
+++ b/lnet/include/libcfs/winnt/winnt-fs.h
@@ -30,18 +30,6 @@
 #endif
 
 
-/*
- * Platform defines
- *
- * cfs_rdev_t
- */
-
-typedef unsigned short cfs_rdev_t;
-
-typedef unsigned int cfs_major_nr_t;
-typedef unsigned int cfs_minor_nr_t;
-
-
 #define MINORBITS      8
 #define MINORMASK      ((1U << MINORBITS) - 1)
 
@@ -51,22 +39,6 @@ typedef unsigned int cfs_minor_nr_t;
 #define MKDEV(ma,mi)   (((ma) << MINORBITS) | (mi))
 
 
-static inline cfs_rdev_t cfs_rdev_build(cfs_major_nr_t major, cfs_minor_nr_t minor)
-{
-    return MKDEV(major, minor);
-}
-
-static inline cfs_major_nr_t cfs_rdev_major(cfs_rdev_t rdev)
-{
-    return MAJOR(rdev);
-}
-
-static inline cfs_minor_nr_t cfs_rdev_minor(cfs_rdev_t rdev)
-{
-    return MINOR(rdev);
-}
-
-
 #ifdef __KERNEL__
 
 struct file_operations

diff --git a/lnet/libcfs/darwin/darwin-fs.c b/lnet/libcfs/darwin/darwin-fs.c
index 45f37df..6fce8d5 100644 (file)
--- a/lnet/libcfs/darwin/darwin-fs.c
+++ b/lnet/libcfs/darwin/darwin-fs.c
@@ -416,21 +416,6 @@ kern_file_sync (cfs_file_t *fp)
 
 #endif /* !__DARWIN8__ */
 
-cfs_rdev_t cfs_rdev_build(cfs_major_nr_t major, cfs_minor_nr_t minor)
-{
-        return makedev(major, minor);
-}
-
-cfs_major_nr_t cfs_rdev_major(cfs_rdev_t rdev)
-{
-        return major(rdev);
-}
-
-cfs_minor_nr_t cfs_rdev_minor(cfs_rdev_t rdev)
-{
-        return minor(rdev);
-}
-
 struct posix_acl *posix_acl_alloc(int count, int flags)
 {
         static struct posix_acl acl;

diff --git a/lnet/libcfs/linux/linux-fs.c b/lnet/libcfs/linux/linux-fs.c
index 061944c..3b15576 100644 (file)
--- a/lnet/libcfs/linux/linux-fs.c
+++ b/lnet/libcfs/linux/linux-fs.c
@@ -51,21 +51,6 @@ cfs_user_write (cfs_file_t *filp, const char *buf, size_t count, loff_t *offset)
        return size;
 }
 
-cfs_rdev_t cfs_rdev_build(cfs_major_nr_t major, cfs_minor_nr_t minor)
-{
-        return MKDEV(major, minor);
-}
-
-cfs_major_nr_t cfs_rdev_major(cfs_rdev_t rdev)
-{
-        return MAJOR(rdev);
-}
-
-cfs_minor_nr_t cfs_rdev_minor(cfs_rdev_t rdev)
-{
-        return MINOR(rdev);
-}
-
 #if !(CFS_O_CREAT == O_CREAT && CFS_O_EXCL == O_EXCL &&        \
      CFS_O_TRUNC == O_TRUNC && CFS_O_APPEND == O_APPEND &&\
      CFS_O_NONBLOCK == O_NONBLOCK && CFS_O_NDELAY == O_NDELAY &&\

diff --git a/lnet/libcfs/misc.c b/lnet/libcfs/misc.c
index 0ace40d..a6a98df 100644 (file)
--- a/lnet/libcfs/misc.c
+++ b/lnet/libcfs/misc.c
@@ -28,26 +28,3 @@
 
 #include <libcfs/libcfs.h>
 
-/*
- * On-wire format is native kdev_t format of Linux kernel 2.6
- */
-enum {
-       WIRE_RDEV_MINORBITS = 20,
-       WIRE_RDEV_MINORMASK = ((1U << WIRE_RDEV_MINORBITS) - 1)
-};
-
-cfs_wire_rdev_t cfs_wire_rdev_build(cfs_major_nr_t major, cfs_minor_nr_t minor)
-{
-        return (major << WIRE_RDEV_MINORBITS) | minor;
-}
-
-cfs_major_nr_t  cfs_wire_rdev_major(cfs_wire_rdev_t rdev)
-{
-        return rdev >> WIRE_RDEV_MINORBITS;
-}
-
-cfs_minor_nr_t  cfs_wire_rdev_minor(cfs_wire_rdev_t rdev)
-{
-        return rdev & WIRE_RDEV_MINORMASK;
-}
-

diff --git a/lnet/libcfs/user-prim.c b/lnet/libcfs/user-prim.c
index 8d968a0..7bfe074 100644 (file)
--- a/lnet/libcfs/user-prim.c
+++ b/lnet/libcfs/user-prim.c
@@ -220,29 +220,6 @@ void cfs_mem_cache_free(cfs_mem_cache_t *c, void *addr)
 #include <linux/kdev_t.h>
 #endif
 
-#ifndef MKDEV
-
-#define MAJOR(dev)      ((dev)>>8)
-#define MINOR(dev)      ((dev) & 0xff)
-#define MKDEV(ma,mi)    ((ma)<<8 | (mi))
-
-#endif
-
-cfs_rdev_t cfs_rdev_build(cfs_major_nr_t major, cfs_minor_nr_t minor)
-{
-        return MKDEV(major, minor);
-}
-
-cfs_major_nr_t cfs_rdev_major(cfs_rdev_t rdev)
-{
-        return MAJOR(rdev);
-}
-
-cfs_minor_nr_t cfs_rdev_minor(cfs_rdev_t rdev)
-{
-        return MINOR(rdev);
-}
-
 void cfs_enter_debugger(void)
 {
         /*