Skip to content

Commit 8d306cb

Browse files
joannekoongMiklos Szeredi
authored andcommitted
fuse: use offset_in_page() for page offset calculations
Replace open-coded (x & ~PAGE_MASK) with offset_in_page(). Reviewed-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Horst Birthelmer <hbirthelmer@ddn.com> Signed-off-by: Joanne Koong <joannelkoong@gmail.com> Reviewed-by: Jingbo Xu <jefflexu@linux.alibaba.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
1 parent dcfd95c commit 8d306cb

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

fs/fuse/readdir.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static void fuse_add_dirent_to_cache(struct file *file,
5252
}
5353
version = fi->rdc.version;
5454
size = fi->rdc.size;
55-
offset = size & ~PAGE_MASK;
55+
offset = offset_in_page(size);
5656
index = size >> PAGE_SHIFT;
5757
/* Dirent doesn't fit in current page? Jump to next page. */
5858
if (offset + reclen > PAGE_SIZE) {
@@ -392,7 +392,7 @@ static enum fuse_parse_result fuse_parse_cache(struct fuse_file *ff,
392392
void *addr, unsigned int size,
393393
struct dir_context *ctx)
394394
{
395-
unsigned int offset = ff->readdir.cache_off & ~PAGE_MASK;
395+
unsigned int offset = offset_in_page(ff->readdir.cache_off);
396396
enum fuse_parse_result res = FOUND_NONE;
397397

398398
WARN_ON(offset >= size);
@@ -518,13 +518,13 @@ static int fuse_readdir_cached(struct file *file, struct dir_context *ctx)
518518
index = ff->readdir.cache_off >> PAGE_SHIFT;
519519

520520
if (index == (fi->rdc.size >> PAGE_SHIFT))
521-
size = fi->rdc.size & ~PAGE_MASK;
521+
size = offset_in_page(fi->rdc.size);
522522
else
523523
size = PAGE_SIZE;
524524
spin_unlock(&fi->rdc.lock);
525525

526526
/* EOF? */
527-
if ((ff->readdir.cache_off & ~PAGE_MASK) == size)
527+
if (offset_in_page(ff->readdir.cache_off) == size)
528528
return 0;
529529

530530
page = find_get_page_flags(file->f_mapping, index,

0 commit comments

Comments
 (0)