X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_io.c;h=a253a9c16a1d454ef03b33a645411fcbfc0a58c4;hb=7a814e94e065551ab79e2ba75df9626e4940efc5;hp=d94bc9742e9969acbd547e78e33586af7fe0068b;hpb=ead6df2feee9c143b617cb60e50e403c955bd401;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c
index d94bc97..a253a9c 100644
--- a/lustre/osd-zfs/osd_io.c
+++ b/lustre/osd-zfs/osd_io.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -143,7 +139,7 @@ static ssize_t osd_read(const struct lu_env *env, struct dt_object *dt,
 			buf->lb_buf, DMU_READ_PREFETCH);
 
 	record_end_io(osd, READ, cfs_time_current() - start, size,
-		      size >> PAGE_CACHE_SHIFT);
+		      size >> PAGE_SHIFT);
 	if (rc == 0) {
 		rc = size;
 		*pos += size;
@@ -232,7 +228,7 @@ static ssize_t osd_write(const struct lu_env *env, struct dt_object *dt,
 
 out:
 	record_end_io(osd, WRITE, 0, buf->lb_len,
-		      buf->lb_len >> PAGE_CACHE_SHIFT);
+		      buf->lb_len >> PAGE_SHIFT);
 
 	RETURN(rc);
 }
@@ -354,8 +350,8 @@ static int osd_bufs_get_read(const struct lu_env *env, struct osd_object *obj,
 			dbf = (void *) ((unsigned long)dbp[i] | 1);
 
 			while (tocpy > 0) {
-				thispage = PAGE_CACHE_SIZE;
-				thispage -= bufoff & (PAGE_CACHE_SIZE - 1);
+				thispage = PAGE_SIZE;
+				thispage -= bufoff & (PAGE_SIZE - 1);
 				thispage = min(tocpy, thispage);
 
 				lnb->lnb_rc = 0;
@@ -432,7 +428,7 @@ static int osd_bufs_get_write(const struct lu_env *env, struct osd_object *obj,
 			/* go over pages arcbuf contains, put them as
 			 * local niobufs for ptlrpc's bulks */
 			while (sz_in_block > 0) {
-				plen = min_t(int, sz_in_block, PAGE_CACHE_SIZE);
+				plen = min_t(int, sz_in_block, PAGE_SIZE);
 
 				lnb[i].lnb_file_offset = off;
 				lnb[i].lnb_page_offset = 0;
@@ -466,7 +462,7 @@ static int osd_bufs_get_write(const struct lu_env *env, struct osd_object *obj,
 
 			/* can't use zerocopy, allocate temp. buffers */
 			while (sz_in_block > 0) {
-				plen = min_t(int, sz_in_block, PAGE_CACHE_SIZE);
+				plen = min_t(int, sz_in_block, PAGE_SIZE);
 
 				lnb[i].lnb_file_offset = off;
 				lnb[i].lnb_page_offset = 0;
@@ -646,7 +642,7 @@ static int osd_declare_write_commit(const struct lu_env *env,
 	 * copies */
 	space  *= osd->od_os->os_copies;
 	space   = toqb(space);
-	CDEBUG(D_QUOTA, "writing %d pages, reserving "LPD64"K of quota space\n",
+	CDEBUG(D_QUOTA, "writing %d pages, reserving %lldK of quota space\n",
 	       npages, space);
 
 	record_start_io(osd, WRITE, discont_pages);