aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/aops.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/aops.c')
-rw-r--r--fs/gfs2/aops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index f42048cc5454..b9fe975d7625 100644
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -243,7 +243,7 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping,
243{ 243{
244 struct inode *inode = mapping->host; 244 struct inode *inode = mapping->host;
245 struct gfs2_sbd *sdp = GFS2_SB(inode); 245 struct gfs2_sbd *sdp = GFS2_SB(inode);
246 unsigned nrblocks = nr_pages * (PAGE_SIZE/inode->i_sb->s_blocksize); 246 unsigned nrblocks = nr_pages * (PAGE_SIZE >> inode->i_blkbits);
247 int i; 247 int i;
248 int ret; 248 int ret;
249 249
@@ -552,7 +552,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos,
552 unsigned size) 552 unsigned size)
553{ 553{
554 struct address_space *mapping = ip->i_inode.i_mapping; 554 struct address_space *mapping = ip->i_inode.i_mapping;
555 unsigned long index = *pos / PAGE_SIZE; 555 unsigned long index = *pos >> PAGE_SHIFT;
556 unsigned offset = *pos & (PAGE_SIZE - 1); 556 unsigned offset = *pos & (PAGE_SIZE - 1);
557 unsigned copied = 0; 557 unsigned copied = 0;
558 unsigned amt; 558 unsigned amt;