[PATCH 20/23] staging/lustre/lprocfs: interpret result of dt_statfs() correctly

[Peng Tao <bergwolf@xxxxxxxxx>]

From: "John L. Hammond" <john.hammond@xxxxxxxxx>

In a7369bcd860af61a073cb2424139e3acccdcb203, 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: LU-3300
Lustre-commit: 09b6f7b2f8832cca4dcf8378170438dcfd333beb
Lustre-change: http://review.whamcloud.com/6385
Signed-off-by: John L. Hammond <john.hammond@xxxxxxxxx>
Reviewed-by: Robert Read <robert.read@xxxxxxxxx>
Reviewed-by: Emoly Liu <emoly.liu@xxxxxxxxx>
Reviewed-by: Andreas Dilger <andreas.dilger@xxxxxxxxx>

[updated for upstream kernel submission]
Signed-off-by: Peng Tao <tao.peng@xxxxxxx>
Signed-off-by: Andreas Dilger <andreas.dilger@xxxxxxxxx>
---
 drivers/staging/lustre/lustre/obdclass/dt_object.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/dt_object.c b/drivers/staging/lustre/lustre/obdclass/dt_object.c
index 4303698..1c962dd 100644
--- a/drivers/staging/lustre/lustre/obdclass/dt_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/dt_object.c
@@ -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);
 	}
-- 
1.7.9.5

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel