effectively no-op change (cleanup) - switch over to using

XFS_IOC_FSGEOMETRY instead of XFS_IOC_GETFSUUID ioctl, so
we can deprecate that "special" UUID ioctl at some point
in the distant future.

diff --git a/include/xfs_fs.h b/include/xfs_fs.h
index f7e68d07374d6aac52f8a7e30d9f1b2805609505..8c61ac71643cd3ad993eba2560f166c41fb269bb 100644 (file)
--- a/include/xfs_fs.h
+++ b/include/xfs_fs.h
@@ -479,12 +479,13 @@ typedef struct xfs_handle {
  * ioctl command to export information not in standard interfaces
  *     140: IRIX statvfs.f_fstr field - UUID from the superblock
  */
+/*      XFS_IOC_GETFSUUID --[TODO]-- deprecated 140      */
 #define XFS_IOC_GETFSUUID            _IOR ('X', 140, unsigned char[16])
 
 
 /*
  * Block I/O parameterization.  A basic block (BB) is the lowest size of
- * filesystem allocation, and must == NBPSCTR.  Length units given to bio
+ * filesystem allocation, and must equal 512.  Length units given to bio
  * routines are in BB's.
  */
 #define        BBSHIFT         9

diff --git a/include/xfs_log.h b/include/xfs_log.h
index 4737daefc77298c1750f473650759a85c5503da8..3de4125f4c1402f3b7a951943a670efa8aaf190d 100644 (file)
--- a/include/xfs_log.h
+++ b/include/xfs_log.h
@@ -165,7 +165,7 @@ int   xfs_log_reserve(struct xfs_mount *mp,
                          int              length,
                          int              count,
                          xfs_log_ticket_t *ticket,
-                         char             clientid,
+                         __uint8_t        clientid,
                          uint             flags);
 int      xfs_log_write(struct xfs_mount *mp,
                        xfs_log_iovec_t  region[],

diff --git a/include/xfs_log_priv.h b/include/xfs_log_priv.h
index 053c0e58a7f93ab19d103cdb7e9962a19c476982..f57712c475dff7e7726887993c78b478ccc203b0 100644 (file)
--- a/include/xfs_log_priv.h
+++ b/include/xfs_log_priv.h
@@ -338,10 +338,10 @@ typedef struct xlog_ticket {
        xlog_tid_t         t_tid;        /* transaction identifier       : 4 */
        int                t_curr_res;   /* current reservation in bytes : 4 */
        int                t_unit_res;   /* unit reservation in bytes    : 4 */
-       char               t_ocnt;       /* original count               : 1 */
-       char               t_cnt;        /* current count                : 1 */
-       char               t_clientid;   /* who does this belong to;     : 1 */
-       char               t_flags;      /* properties of reservation    : 1 */
+       __uint8_t          t_ocnt;       /* original count               : 1 */
+       __uint8_t          t_cnt;        /* current count                : 1 */
+       __uint8_t          t_clientid;   /* who does this belong to;     : 1 */
+       __uint8_t          t_flags;      /* properties of reservation    : 1 */
 } xlog_ticket_t;
 #endif
 
@@ -349,8 +349,8 @@ typedef struct xlog_ticket {
 typedef struct xlog_op_header {
        xlog_tid_t oh_tid;      /* transaction id of operation  :  4 b */
        int        oh_len;      /* bytes in data region         :  2 b */
-       char       oh_clientid; /* who sent me this             :  1 b */
-       char       oh_flags;    /*                              :  1 b */
+       __uint8_t  oh_clientid; /* who sent me this             :  1 b */
+       __uint8_t  oh_flags;    /*                              :  1 b */
        ushort     oh_res2;     /* 32 bit align                 :  2 b */
 } xlog_op_header_t;
 
@@ -433,7 +433,7 @@ typedef struct xlog_in_core {
                xlog_rec_header_t hic_header;
                char              hic_sector[XLOG_HEADER_SIZE];
        } ic_h2;
-       char                   ic_data[1];
+       __uint8_t                 ic_data[1];
 } xlog_in_core_t;
 
 /*