From 08d07dd23b94bdb77a4a9de8a4217a4f31220c26 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 21 Feb 2015 00:32:38 +0000 Subject: [PATCH] inode: use BLKOFF This saves a bit of memory --- Kernel/inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Kernel/inode.c b/Kernel/inode.c index 3831c0ae..1fb217d5 100644 --- a/Kernel/inode.c +++ b/Kernel/inode.c @@ -58,7 +58,7 @@ void readi(inoptr ino, uint8_t flag) loop: while (toread) { - amount = min(toread, BLKSIZE - (udata.u_offset&BLKMASK)); + amount = min(toread, BLKSIZE - BLKOFF(udata.u_offset)); pblk = bmap(ino, udata.u_offset >> BLKSHIFT, 1); #if defined(read_direct) @@ -82,7 +82,7 @@ void readi(inoptr ino, uint8_t flag) else bp = bread(dev, pblk, 0); - uputsys(bp + (udata.u_offset & BLKMASK), amount); + uputsys(bp + BLKOFF(udata.u_offset), amount); brelse(bp); } @@ -163,7 +163,7 @@ void writei(inoptr ino, uint8_t flag) loop: while (towrite) { - amount = min(towrite, BLKSIZE - (udata.u_offset&BLKMASK)); + amount = min(towrite, BLKSIZE - BLKOFF(udata.u_offset)); if ((pblk = bmap(ino, udata.u_offset >> BLKSHIFT, @@ -175,7 +175,7 @@ void writei(inoptr ino, uint8_t flag) */ bp = bread(dev, pblk, (amount == BLKSIZE)); - ugetsys(bp + (udata.u_offset & BLKMASK), amount); + ugetsys(bp + BLKOFF(udata.u_offset), amount); /* FIXME: O_SYNC */ bawrite(bp); -- 2.34.1