X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_object.c;h=aa878d275c30393bffff42682c407c6800d9a561;hb=72057a3af19ee02d9a686bd7e7d074917e381310;hp=454311c8b0338a04043b0038cdea89129faa590e;hpb=500f334631c6ebec72f5791472f21603da3e0ef9;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_object.c b/lustre/osc/osc_object.c
index 454311c..aa878d2 100644
--- a/lustre/osc/osc_object.c
+++ b/lustre/osc/osc_object.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
  */
@@ -241,15 +237,15 @@ static int osc_object_fiemap(const struct lu_env *env, struct cl_object *obj,
 	if (!(fmkey->lfik_fiemap.fm_flags & FIEMAP_FLAG_SYNC))
 		goto skip_locking;
 
-	policy.l_extent.start = fmkey->lfik_fiemap.fm_start & PAGE_CACHE_MASK;
+	policy.l_extent.start = fmkey->lfik_fiemap.fm_start & PAGE_MASK;
 
 	if (OBD_OBJECT_EOF - fmkey->lfik_fiemap.fm_length <=
-	    fmkey->lfik_fiemap.fm_start + PAGE_CACHE_SIZE - 1)
+	    fmkey->lfik_fiemap.fm_start + PAGE_SIZE - 1)
 		policy.l_extent.end = OBD_OBJECT_EOF;
 	else
 		policy.l_extent.end = (fmkey->lfik_fiemap.fm_start +
 				       fmkey->lfik_fiemap.fm_length +
-				       PAGE_CACHE_SIZE - 1) & PAGE_CACHE_MASK;
+				       PAGE_SIZE - 1) & PAGE_MASK;
 
 	ostid_build_res_name(&fmkey->lfik_oa.o_oi, &resid);
 	mode = ldlm_lock_match(exp->exp_obd->obd_namespace,