OSDN Git Service

staging/lustre/lprocfs: interpret result of dt_statfs() correctly
authorJohn L. Hammond <john.hammond@intel.com>
Wed, 5 Jun 2013 13:13:40 +0000 (21:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Jun 2013 22:16:22 +0000 (15:16 -0700)
I accidentally reversed the sense of the error check after the call to
dt_statfs() in lprocfs_dt_rd_{blksize,{files,kbytes}{free,avail}.
Unreverse the error checking.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3300
Lustre-change: http://review.whamcloud.com/6385
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Robert Read <robert.read@intel.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/obdclass/dt_object.c

index 4303698..1c962dd 100644 (file)
@@ -944,9 +944,9 @@ int lprocfs_dt_rd_blksize(char *page, char **start, off_t off,
        struct obd_statfs osfs;
 
        int rc = dt_statfs(NULL, dt, &osfs);
-       if (rc != 0) {
+       if (rc == 0) {
                *eof = 1;
-               rc = snprintf(page, count, "%d\n",
+               rc = snprintf(page, count, "%u\n",
                                (unsigned) osfs.os_bsize);
        }
 
@@ -961,7 +961,7 @@ int lprocfs_dt_rd_kbytestotal(char *page, char **start, off_t off,
        struct obd_statfs osfs;
 
        int rc = dt_statfs(NULL, dt, &osfs);
-       if (rc != 0) {
+       if (rc == 0) {
                __u32 blk_size = osfs.os_bsize >> 10;
                __u64 result = osfs.os_blocks;
 
@@ -983,7 +983,7 @@ int lprocfs_dt_rd_kbytesfree(char *page, char **start, off_t off,
        struct obd_statfs osfs;
 
        int rc = dt_statfs(NULL, dt, &osfs);
-       if (rc != 0) {
+       if (rc == 0) {
                __u32 blk_size = osfs.os_bsize >> 10;
                __u64 result = osfs.os_bfree;
 
@@ -1005,7 +1005,7 @@ int lprocfs_dt_rd_kbytesavail(char *page, char **start, off_t off,
        struct obd_statfs osfs;
 
        int rc = dt_statfs(NULL, dt, &osfs);
-       if (rc != 0) {
+       if (rc == 0) {
                __u32 blk_size = osfs.os_bsize >> 10;
                __u64 result = osfs.os_bavail;
 
@@ -1027,7 +1027,7 @@ int lprocfs_dt_rd_filestotal(char *page, char **start, off_t off,
        struct obd_statfs osfs;
 
        int rc = dt_statfs(NULL, dt, &osfs);
-       if (rc != 0) {
+       if (rc == 0) {
                *eof = 1;
                rc = snprintf(page, count, LPU64"\n", osfs.os_files);
        }
@@ -1043,7 +1043,7 @@ int lprocfs_dt_rd_filesfree(char *page, char **start, off_t off,
        struct obd_statfs osfs;
 
        int rc = dt_statfs(NULL, dt, &osfs);
-       if (rc != 0) {
+       if (rc == 0) {
                *eof = 1;
                rc = snprintf(page, count, LPU64"\n", osfs.os_ffree);
        }