LU-1757 brw: added OBDO short io flag

[fs/lustre-release.git] / lustre / obdclass / dt_object.c

diff --git a/lustre/obdclass/dt_object.c b/lustre/obdclass/dt_object.c
index 13962cd..deb5863 100644 (file)
--- a/lustre/obdclass/dt_object.c
+++ b/lustre/obdclass/dt_object.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -808,7 +808,7 @@ int dt_index_walk(const struct lu_env *env, struct dt_object *obj,
                int              i;
 
                LASSERT(pageidx < rdpg->rp_npages);
-               lp = cfs_kmap(rdpg->rp_pages[pageidx]);
+               lp = kmap(rdpg->rp_pages[pageidx]);
 
                /* fill lu pages */
                for (i = 0; i < LU_PAGE_COUNT; i++, lp++, nob -= LU_PAGE_SIZE) {
@@ -822,7 +822,7 @@ int dt_index_walk(const struct lu_env *env, struct dt_object *obj,
                                /* end of index */
                                break;
                }
-               cfs_kunmap(rdpg->rp_pages[i]);
+               kunmap(rdpg->rp_pages[i]);
        }
 
        iops->put(env, it);
@@ -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);
        }