gfs_ondisk.h   gfs_ondisk.h 
skipping to change at line 789 skipping to change at line 789
/** /**
* gfs_inum_print - Print out a inode number * gfs_inum_print - Print out a inode number
* @no: the cpu-order buffer * @no: the cpu-order buffer
* *
*/ */
void void
gfs_inum_print(struct gfs_inum *no) gfs_inum_print(struct gfs_inum *no)
{ {
pv(no, no_formal_ino, "%"PRIu64); pv(no, no_formal_ino, "%llu");
pv(no, no_addr, "%"PRIu64); pv(no, no_addr, "%llu");
} }
/** /**
* gfs_meta_header_in - Read in a metadata header * gfs_meta_header_in - Read in a metadata header
* @mh: the cpu-order structure * @mh: the cpu-order structure
* @buf: the disk-order buffer * @buf: the disk-order buffer
* *
*/ */
void void
skipping to change at line 848 skipping to change at line 848
* gfs_meta_header_print - Print out a metadata header * gfs_meta_header_print - Print out a metadata header
* @mh: the cpu-order buffer * @mh: the cpu-order buffer
* *
*/ */
void void
gfs_meta_header_print(struct gfs_meta_header *mh) gfs_meta_header_print(struct gfs_meta_header *mh)
{ {
pv(mh, mh_magic, "0x%.8X"); pv(mh, mh_magic, "0x%.8X");
pv(mh, mh_type, "%u"); pv(mh, mh_type, "%u");
pv(mh, mh_generation, "%"PRIu64); pv(mh, mh_generation, "%llu");
pv(mh, mh_format, "%u"); pv(mh, mh_format, "%u");
pv(mh, mh_incarn, "%u"); pv(mh, mh_incarn, "%u");
} }
/** /**
* gfs_sb_in - Read in a superblock * gfs_sb_in - Read in a superblock
* @sb: the cpu-order structure * @sb: the cpu-order structure
* @buf: the disk-order buffer * @buf: the disk-order buffer
* *
*/ */
skipping to change at line 1002 skipping to change at line 1002
/** /**
* gfs_jindex_print - Print out a journal index structure * gfs_jindex_print - Print out a journal index structure
* @ji: the cpu-order buffer * @ji: the cpu-order buffer
* *
*/ */
void void
gfs_jindex_print(struct gfs_jindex *ji) gfs_jindex_print(struct gfs_jindex *ji)
{ {
pv(ji, ji_addr, "%"PRIu64); pv(ji, ji_addr, "%llu");
pv(ji, ji_nsegment, "%u"); pv(ji, ji_nsegment, "%u");
pv(ji, ji_pad, "%u"); pv(ji, ji_pad, "%u");
pa(ji, ji_reserved, 64); pa(ji, ji_reserved, 64);
} }
/** /**
* gfs_rindex_in - Read in a resource index structure * gfs_rindex_in - Read in a resource index structure
* @rindex: the cpu-order structure * @rindex: the cpu-order structure
* @buf: the disk-order buffer * @buf: the disk-order buffer
skipping to change at line 1066 skipping to change at line 1066
/** /**
* gfs_rindex_print - Print out a resource index structure * gfs_rindex_print - Print out a resource index structure
* @ri: the cpu-order buffer * @ri: the cpu-order buffer
* *
*/ */
void void
gfs_rindex_print(struct gfs_rindex *ri) gfs_rindex_print(struct gfs_rindex *ri)
{ {
pv(ri, ri_addr, "%"PRIu64); pv(ri, ri_addr, "%llu");
pv(ri, ri_length, "%u"); pv(ri, ri_length, "%u");
pv(ri, ri_pad, "%u"); pv(ri, ri_pad, "%u");
pv(ri, ri_data1, "%"PRIu64); pv(ri, ri_data1, "%llu");
pv(ri, ri_data, "%u"); pv(ri, ri_data, "%u");
pv(ri, ri_bitbytes, "%u"); pv(ri, ri_bitbytes, "%u");
pa(ri, ri_reserved, 64); pa(ri, ri_reserved, 64);
} }
/** /**
* gfs_rgrp_in - Read in a resource group header * gfs_rgrp_in - Read in a resource group header
* @rgrp: the cpu-order structure * @rgrp: the cpu-order structure
skipping to change at line 1206 skipping to change at line 1206
/** /**
* gfs_quota_print - Print out a quota structure * gfs_quota_print - Print out a quota structure
* @quota: the cpu-order buffer * @quota: the cpu-order buffer
* *
*/ */
void void
gfs_quota_print(struct gfs_quota *quota) gfs_quota_print(struct gfs_quota *quota)
{ {
pv(quota, qu_limit, "%"PRIu64); pv(quota, qu_limit, "%llu");
pv(quota, qu_warn, "%"PRIu64); pv(quota, qu_warn, "%llu");
pv(quota, qu_value, "%"PRId64); pv(quota, qu_value, "%llu");
pa(quota, qu_reserved, 64); pa(quota, qu_reserved, 64);
} }
/** /**
* gfs_dinode_in - Read in a dinode * gfs_dinode_in - Read in a dinode
* @dinode: the cpu-order structure * @dinode: the cpu-order structure
* @buf: the disk-order buffer * @buf: the disk-order buffer
* *
*/ */
skipping to change at line 1328 skipping to change at line 1328
gfs_dinode_print(struct gfs_dinode *di) gfs_dinode_print(struct gfs_dinode *di)
{ {
gfs_meta_header_print(&di->di_header); gfs_meta_header_print(&di->di_header);
gfs_inum_print(&di->di_num); gfs_inum_print(&di->di_num);
pv(di, di_mode, "0%o"); pv(di, di_mode, "0%o");
pv(di, di_uid, "%u"); pv(di, di_uid, "%u");
pv(di, di_gid, "%u"); pv(di, di_gid, "%u");
pv(di, di_nlink, "%u"); pv(di, di_nlink, "%u");
pv(di, di_size, "%"PRIu64); pv(di, di_size, "%llu");
pv(di, di_blocks, "%"PRIu64); pv(di, di_blocks, "%llu");
pv(di, di_atime, "%"PRId64); pv(di, di_atime, "%lld");
pv(di, di_mtime, "%"PRId64); pv(di, di_mtime, "%llu");
pv(di, di_ctime, "%"PRId64); pv(di, di_ctime, "%llu");
pv(di, di_major, "%u"); pv(di, di_major, "%u");
pv(di, di_minor, "%u"); pv(di, di_minor, "%u");
pv(di, di_rgrp, "%"PRIu64); pv(di, di_rgrp, "%llu");
pv(di, di_goal_rgrp, "%"PRIu64); pv(di, di_goal_rgrp, "%llu");
pv(di, di_goal_dblk, "%u"); pv(di, di_goal_dblk, "%u");
pv(di, di_goal_mblk, "%u"); pv(di, di_goal_mblk, "%u");
pv(di, di_flags, "0x%.8X"); pv(di, di_flags, "0x%.8X");
pv(di, di_payload_format, "%u"); pv(di, di_payload_format, "%u");
pv(di, di_type, "%u"); pv(di, di_type, "%u");
pv(di, di_height, "%u"); pv(di, di_height, "%u");
pv(di, di_incarn, "%u"); pv(di, di_incarn, "%u");
pv(di, di_pad, "%u"); pv(di, di_pad, "%u");
pv(di, di_depth, "%u"); pv(di, di_depth, "%u");
pv(di, di_entries, "%u"); pv(di, di_entries, "%u");
gfs_inum_print(&di->di_next_unused); gfs_inum_print(&di->di_next_unused);
pv(di, di_eattr, "%"PRIu64); pv(di, di_eattr, "%llu");
pa(di, di_reserved, 56); pa(di, di_reserved, 56);
} }
/** /**
* gfs_indirect_in - copy in the header of an indirect block * gfs_indirect_in - copy in the header of an indirect block
* @indirect: the in memory copy * @indirect: the in memory copy
* @buf: the buffer copy * @buf: the buffer copy
* *
*/ */
skipping to change at line 1530 skipping to change at line 1530
*/ */
void void
gfs_leaf_print(struct gfs_leaf *lf) gfs_leaf_print(struct gfs_leaf *lf)
{ {
gfs_meta_header_print(&lf->lf_header); gfs_meta_header_print(&lf->lf_header);
pv(lf, lf_depth, "%u"); pv(lf, lf_depth, "%u");
pv(lf, lf_entries, "%u"); pv(lf, lf_entries, "%u");
pv(lf, lf_dirent_format, "%u"); pv(lf, lf_dirent_format, "%u");
pv(lf, lf_next, "%"PRIu64); pv(lf, lf_next, "%llu");
pa(lf, lf_reserved, 64); pa(lf, lf_reserved, 64);
} }
/** /**
* gfs_log_header_in - Read in a log header * gfs_log_header_in - Read in a log header
* @head: the cpu-order structure * @head: the cpu-order structure
* @buf: the disk-order buffer * @buf: the disk-order buffer
* *
*/ */
skipping to change at line 1601 skipping to change at line 1601
*/ */
void void
gfs_log_header_print(struct gfs_log_header *lh) gfs_log_header_print(struct gfs_log_header *lh)
{ {
gfs_meta_header_print(&lh->lh_header); gfs_meta_header_print(&lh->lh_header);
pv(lh, lh_flags, "0x%.8X"); pv(lh, lh_flags, "0x%.8X");
pv(lh, lh_pad, "%u"); pv(lh, lh_pad, "%u");
pv(lh, lh_first, "%"PRIu64); pv(lh, lh_first, "%llu");
pv(lh, lh_sequence, "%"PRIu64); pv(lh, lh_sequence, "%llu");
pv(lh, lh_tail, "%"PRIu64); pv(lh, lh_tail, "%llu");
pv(lh, lh_last_dump, "%"PRIu64); pv(lh, lh_last_dump, "%llu");
pa(lh, lh_reserved, 64); pa(lh, lh_reserved, 64);
} }
/** /**
* gfs_desc_in - Read in a log descriptor * gfs_desc_in - Read in a log descriptor
* @desc: the cpu-order structure * @desc: the cpu-order structure
* @buf: the disk-order buffer * @buf: the disk-order buffer
* *
*/ */
skipping to change at line 1716 skipping to change at line 1716
/** /**
* gfs_block_tag_print - Print out a block tag * gfs_block_tag_print - Print out a block tag
* @tag: the cpu-order buffer * @tag: the cpu-order buffer
* *
*/ */
void void
gfs_block_tag_print(struct gfs_block_tag *tag) gfs_block_tag_print(struct gfs_block_tag *tag)
{ {
pv(tag, bt_blkno, "%"PRIu64); pv(tag, bt_blkno, "%llu");
pv(tag, bt_flags, "%u"); pv(tag, bt_flags, "%u");
pv(tag, bt_pad, "%u"); pv(tag, bt_pad, "%u");
} }
/** /**
* gfs_quota_tag_in - Read in a quota tag * gfs_quota_tag_in - Read in a quota tag
* @tag: the cpu-order structure * @tag: the cpu-order structure
* @buf: the disk-order buffer * @buf: the disk-order buffer
* *
*/ */
skipping to change at line 1764 skipping to change at line 1764
/** /**
* gfs_quota_tag_print - Print out a quota tag * gfs_quota_tag_print - Print out a quota tag
* @tag: the cpu-order buffer * @tag: the cpu-order buffer
* *
*/ */
void void
gfs_quota_tag_print(struct gfs_quota_tag *tag) gfs_quota_tag_print(struct gfs_quota_tag *tag)
{ {
pv(tag, qt_change, "%"PRId64); pv(tag, qt_change, "%llu");
pv(tag, qt_flags, "0x%.8X"); pv(tag, qt_flags, "0x%.8X");
pv(tag, qt_id, "%u"); pv(tag, qt_id, "%u");
} }
/** /**
* gfs_ea_header_in - Read in a Extended Attribute header * gfs_ea_header_in - Read in a Extended Attribute header
* @tag: the cpu-order structure * @tag: the cpu-order structure
* @buf: the disk-order buffer * @buf: the disk-order buffer
* *
*/ */
 End of changes. 14 change blocks. 
24 lines changed or deleted 24 lines changed or added


 libfence.h   libfence.h 
skipping to change at line 19 skipping to change at line 19
#define FE_AGENT_ERROR 2 /* agent exited with EXIT_FAILURE */ #define FE_AGENT_ERROR 2 /* agent exited with EXIT_FAILURE */
#define FE_AGENT_FORK 3 /* error forking agent */ #define FE_AGENT_FORK 3 /* error forking agent */
#define FE_NO_CONFIG 4 /* ccs_connect error */ #define FE_NO_CONFIG 4 /* ccs_connect error */
#define FE_NO_METHOD 5 /* zero methods defined */ #define FE_NO_METHOD 5 /* zero methods defined */
#define FE_NO_DEVICE 6 /* zero devices defined in method */ #define FE_NO_DEVICE 6 /* zero devices defined in method */
#define FE_READ_AGENT 7 /* read (ccs) error on agent path */ #define FE_READ_AGENT 7 /* read (ccs) error on agent path */
#define FE_READ_ARGS 8 /* read (ccs) error on node/dev args */ #define FE_READ_ARGS 8 /* read (ccs) error on node/dev args */
#define FE_READ_METHOD 9 /* read (ccs) error on method */ #define FE_READ_METHOD 9 /* read (ccs) error on method */
#define FE_READ_DEVICE 10 /* read (ccs) error on method/device */ #define FE_READ_DEVICE 10 /* read (ccs) error on method/device */
#define FENCE_AGENT_NAME_MAX 256 #define FENCE_AGENT_NAME_MAX 256 /* including terminating \0 */
#define FENCE_AGENT_ARGS_MAX 1024 #define FENCE_AGENT_ARGS_MAX 4096 /* including terminating \0 */
struct fence_log { struct fence_log {
int error; int error;
int method_num; int method_num;
int device_num; int device_num;
char agent_name[FENCE_AGENT_NAME_MAX+1]; char agent_name[FENCE_AGENT_NAME_MAX];
char agent_args[FENCE_AGENT_ARGS_MAX+1]; char agent_args[FENCE_AGENT_ARGS_MAX];
}; };
int fence_node(char *name, struct fence_log *log, int log_size, int *log_co unt); int fence_node(char *name, struct fence_log *log, int log_size, int *log_co unt);
int unfence_node(char *name, struct fence_log *log, int log_size, int unfence_node(char *name, struct fence_log *log, int log_size,
int *log_count); int *log_count);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/