Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 224721 Details for
Bug 251180
Build time warnings for gfs2 userland tools
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Patch for HEAD branch of CVS
251180.buildwarn.HEAD.patch (text/plain), 8.34 KB, created by
Robert Peterson
on 2007-10-11 20:15:50 UTC
(
hide
)
Description:
Patch for HEAD branch of CVS
Filename:
MIME Type:
Creator:
Robert Peterson
Created:
2007-10-11 20:15:50 UTC
Size:
8.34 KB
patch
obsolete
>Index: edit/savemeta.c >=================================================================== >RCS file: /cvs/cluster/cluster/gfs2/edit/savemeta.c,v >retrieving revision 1.2 >diff -w -u -p -p -u -r1.2 savemeta.c >--- edit/savemeta.c 16 Jul 2007 23:16:35 -0000 1.2 >+++ edit/savemeta.c 11 Oct 2007 18:56:53 -0000 >@@ -282,7 +282,7 @@ int gfs1_rindex_read(struct gfs2_sbd *sd > int error; > struct gfs2_rindex buf; > struct rgrp_list *rgd, *prev_rgd; >- uint64_t prev_length; >+ uint64_t prev_length = 0; > > *count1 = 0; > prev_rgd = NULL; >@@ -620,11 +620,11 @@ int restore_data(int fd, int in_fd) > uint64_t buf64, writes = 0; > uint16_t buf16; > int first = 1; >- uint64_t max_fs_size; > > do_lseek(fd, 0); > blks_saved = 0; > total_out = 0; >+ last_fs_block = 0; > while (TRUE) { > memset(savedata, 0, sizeof(struct saved_metablock)); > rs = read(in_fd, &buf64, sizeof(uint64_t)); >@@ -635,11 +635,11 @@ int restore_data(int fd, int in_fd) > return -1; > } > savedata->blk = be64_to_cpu(buf64); >- if (savedata->blk >= max_fs_size) { >+ if (last_fs_block && savedata->blk >= last_fs_block) { > fprintf(stderr, "Error: File system is too small to " > "restore this metadata.\n"); > fprintf(stderr, "File system is %" PRIu64 " blocks, ", >- max_fs_size); >+ last_fs_block); > fprintf(stderr, "Restore block = %" PRIu64 "\n", > savedata->blk); > return -1; >Index: fsck/lost_n_found.c >=================================================================== >RCS file: /cvs/cluster/cluster/gfs2/fsck/lost_n_found.c,v >retrieving revision 1.3 >diff -w -u -p -p -u -r1.3 lost_n_found.c >--- fsck/lost_n_found.c 12 Jun 2006 20:41:43 -0000 1.3 >+++ fsck/lost_n_found.c 11 Oct 2007 18:56:53 -0000 >@@ -15,7 +15,6 @@ > #include <stdio.h> > #include <stdlib.h> > #include <string.h> >-#include <sys/types.h> > #include <sys/stat.h> > #include <unistd.h> > #include <dirent.h> >@@ -94,35 +93,35 @@ int add_inode_to_lf(struct gfs2_inode *i > > dir_add(ip, filename, filename_len, &(lf_dip->i_di.di_num), DT_DIR); > free(filename); >- sprintf(tmp_name, "lost_dir_%"PRIu64, ip->i_di.di_num.no_addr); >+ sprintf(tmp_name, "lost_dir_%llu", ip->i_di.di_num.no_addr); > inode_type = DT_DIR; > break; > case S_IFREG: >- sprintf(tmp_name, "lost_file_%"PRIu64, ip->i_di.di_num.no_addr); >+ sprintf(tmp_name, "lost_file_%llu", ip->i_di.di_num.no_addr); > inode_type = DT_REG; > break; > case S_IFLNK: >- sprintf(tmp_name, "lost_link_%"PRIu64, ip->i_di.di_num.no_addr); >+ sprintf(tmp_name, "lost_link_%llu", ip->i_di.di_num.no_addr); > inode_type = DT_LNK; > break; > case S_IFBLK: >- sprintf(tmp_name, "lost_blkdev_%"PRIu64, ip->i_di.di_num.no_addr); >+ sprintf(tmp_name, "lost_blkdev_%llu", ip->i_di.di_num.no_addr); > inode_type = DT_BLK; > break; > case S_IFCHR: >- sprintf(tmp_name, "lost_chrdev_%"PRIu64, ip->i_di.di_num.no_addr); >+ sprintf(tmp_name, "lost_chrdev_%llu", ip->i_di.di_num.no_addr); > inode_type = DT_CHR; > break; > case S_IFIFO: >- sprintf(tmp_name, "lost_fifo_%"PRIu64, ip->i_di.di_num.no_addr); >+ sprintf(tmp_name, "lost_fifo_%llu", ip->i_di.di_num.no_addr); > inode_type = DT_FIFO; > break; > case S_IFSOCK: >- sprintf(tmp_name, "lost_socket_%"PRIu64, ip->i_di.di_num.no_addr); >+ sprintf(tmp_name, "lost_socket_%llu", ip->i_di.di_num.no_addr); > inode_type = DT_SOCK; > break; > default: >- sprintf(tmp_name, "lost_%"PRIu64, ip->i_di.di_num.no_addr); >+ sprintf(tmp_name, "lost_%llu", ip->i_di.di_num.no_addr); > inode_type = DT_REG; > break; > } >Index: libgfs2/fs_ops.c >=================================================================== >RCS file: /cvs/cluster/cluster/gfs2/libgfs2/fs_ops.c,v >retrieving revision 1.12 >diff -w -u -p -p -u -r1.12 fs_ops.c >--- libgfs2/fs_ops.c 24 Sep 2007 23:16:34 -0000 1.12 >+++ libgfs2/fs_ops.c 11 Oct 2007 18:56:53 -0000 >@@ -1363,7 +1363,7 @@ static int linked_leaf_search(struct gfs > static int dir_e_search(struct gfs2_inode *dip, const char *filename, > int len, unsigned int *type, struct gfs2_inum *inum) > { >- struct gfs2_buffer_head *bh; >+ struct gfs2_buffer_head *bh = NULL; > struct gfs2_dirent *dent; > int error; > >@@ -1445,7 +1445,7 @@ static int dir_e_del(struct gfs2_inode * > int error; > int found = 0; > uint64_t leaf_no; >- struct gfs2_buffer_head *bh; >+ struct gfs2_buffer_head *bh = NULL; > struct gfs2_dirent *cur, *prev; > > index = (1 << (dip->i_di.di_depth))-1; >@@ -1471,8 +1471,10 @@ static int dir_e_del(struct gfs2_inode * > if(!found) > return 1; > >+ if (bh) { > dirent2_del(dip, bh, prev, cur); > brelse(bh, updated); >+ } > return 0; > } > >Index: libgfs2/ondisk.c >=================================================================== >RCS file: /cvs/cluster/cluster/gfs2/libgfs2/ondisk.c,v >retrieving revision 1.7 >diff -w -u -p -p -u -r1.7 ondisk.c >--- libgfs2/ondisk.c 24 Aug 2007 06:08:26 -0000 1.7 >+++ libgfs2/ondisk.c 11 Oct 2007 18:56:53 -0000 >@@ -32,28 +32,6 @@ > #define CPIN_64(s1, s2, member) {(s1->member) = be64_to_cpu((s2->member));} > #define CPOUT_64(s1, s2, member) {(s2->member) = cpu_to_be64((s1->member));} > >-/** >- * print_array - Print out an array of bytes >- * @title: what to print before the array >- * @buf: the array >- * @count: the number of bytes >- * >- */ >- >-static void print_array(char *title, unsigned char *buf, int count) >-{ >- int x; >- >- printf(" %s =\n", title); >- for (x = 0; x < count; x++) { >- printf("%.2X ", (unsigned char)buf[x]); >- if (x % 16 == 15) >- printf("\n"); >- } >- if (x % 16) >- printf("\n"); >-} >- > /* > * gfs2_xxx_in - read in an xxx struct > * first arg: the cpu-order structure >Index: libgfs2/super.c >=================================================================== >RCS file: /cvs/cluster/cluster/gfs2/libgfs2/super.c,v >retrieving revision 1.5 >diff -w -u -p -p -u -r1.5 super.c >--- libgfs2/super.c 26 Jun 2007 01:25:33 -0000 1.5 >+++ libgfs2/super.c 11 Oct 2007 18:56:53 -0000 >@@ -179,7 +179,7 @@ int rindex_read(struct gfs2_sbd *sdp, in > int error; > struct gfs2_rindex buf; > struct rgrp_list *rgd, *prev_rgd; >- uint64_t prev_length; >+ uint64_t prev_length = 0; > > *count1 = 0; > prev_rgd = NULL; >Index: quota/main.c >=================================================================== >RCS file: /cvs/cluster/cluster/gfs2/quota/main.c,v >retrieving revision 1.8 >diff -w -u -p -p -u -r1.8 main.c >--- quota/main.c 24 Aug 2007 06:08:26 -0000 1.8 >+++ quota/main.c 11 Oct 2007 18:56:53 -0000 >@@ -255,24 +255,24 @@ print_quota(commandline_t *comline, > > case GQ_UNITS_KILOBYTE: > if (sb->sb_bsize == 512) >- printf("limit: %-10"PRIu64" warn: %-10"PRIu64"value: %-10"PRId64"\n", >+ printf("limit: %-10llu warn: %-10lluvalue: %-10llu\n", > q->qu_limit / 2, > q->qu_warn / 2, > q->qu_value / 2); > else >- printf("limit: %-10"PRIu64" warn: %-10"PRIu64"value: %-10"PRId64"\n", >+ printf("limit: %-10llu warn: %-10lluvalue: %-10llu\n", > q->qu_limit << (sb->sb_bsize_shift - 10), > q->qu_warn << (sb->sb_bsize_shift - 10), > q->qu_value << (sb->sb_bsize_shift - 10)); > break; > > case GQ_UNITS_FSBLOCK: >- printf("limit: %-10"PRIu64" warn: %-10"PRIu64" value: %-10"PRId64"\n", >+ printf("limit: %-10llu warn: %-10llu value: %-10llu\n", > q->qu_limit, q->qu_warn, q->qu_value); > break; > > case GQ_UNITS_BASICBLOCK: >- printf("limit: %-10"PRIu64" warn: %-10"PRIu64" value: %-10"PRId64"\n", >+ printf("limit: %-10llu warn: %-10llu value: %-10llu\n", > q->qu_limit << (sb->sb_bsize_shift - 9), > q->qu_warn << (sb->sb_bsize_shift - 9), > q->qu_value << (sb->sb_bsize_shift - 9)); >@@ -319,8 +319,8 @@ read_quota_internal(int fd, uint32_t id, > if (error < 0) > die("failed to read from quota file: %s\n", strerror(errno)); > if (error != sizeof(struct gfs2_quota)) >- die("Couldn't read %d bytes from quota file at offset %llu\n", >- sizeof(struct gfs2_quota), offset); >+ die("Couldn't read %lu bytes from quota file at offset %llu\n", >+ sizeof(struct gfs2_quota), (unsigned long long)offset); > gfs2_quota_in(q, buf); > } > >Index: tool/main.c >=================================================================== >RCS file: /cvs/cluster/cluster/gfs2/tool/main.c,v >retrieving revision 1.5 >diff -w -u -p -p -u -r1.5 main.c >--- tool/main.c 22 Aug 2007 08:58:46 -0000 1.5 >+++ tool/main.c 11 Oct 2007 18:56:53 -0000 >@@ -225,9 +225,7 @@ main(int argc, char *argv[]) > > decode_arguments(argc, argv); > >- if (FALSE) { >- /* Do Nothing */ >- } else if (strcmp(action, "clearflag") == 0) >+ if (strcmp(action, "clearflag") == 0) > set_flag(argc, argv); > else if (strcmp(action, "counters") == 0) > print_counters(argc, argv);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 251180
:
173601
| 224721 |
224731