Skip to content

Fix version-check macro precedence and collapse write_begin variants #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jserv merged 2 commits into from
Aug 9, 2026
Merged

Fix version-check macro precedence and collapse write_begin variants #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5b5e4e
Add missing parentheses to version-check macros
RoyWFHuang Jul 19, 2026
65bec5b
Collapse duplicated simplefs_write_begin variants
RoyWFHuang Jul 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 7 additions & 62 deletions file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,26 +122,6 @@ static int simplefs_write_begin(const struct kiocb *iocb,
void **fsdata)
{
struct file *file = iocb->ki_filp;
struct simplefs_sb_info *sbi = SIMPLEFS_SB(file->f_inode->i_sb);
int err;
uint32_t nr_allocs = 0;

if (pos + len > SIMPLEFS_MAX_FILESIZE)
return -ENOSPC;

nr_allocs = max(pos + len, file->f_inode->i_size) / SIMPLEFS_BLOCK_SIZE;
if (nr_allocs > file->f_inode->i_blocks - 1)
nr_allocs -= file->f_inode->i_blocks - 1;
else
nr_allocs = 0;
if (nr_allocs > sbi->nr_free_blocks)
return -ENOSPC;

err = block_write_begin(mapping, pos, len, foliop, simplefs_file_get_block);
if (err < 0)
pr_err("newly allocated blocks reclaim not implemented yet\n");
return err;
}
#elif SIMPLEFS_AT_LEAST(6, 12, 0)
static int simplefs_write_begin(struct file *file,
struct address_space *mapping,
Expand All @@ -150,26 +130,6 @@ static int simplefs_write_begin(struct file *file,
struct folio **foliop,
void **fsdata)
{
struct simplefs_sb_info *sbi = SIMPLEFS_SB(file->f_inode->i_sb);
int err;
uint32_t nr_allocs = 0;

if (pos + len > SIMPLEFS_MAX_FILESIZE)
return -ENOSPC;

nr_allocs = max(pos + len, file->f_inode->i_size) / SIMPLEFS_BLOCK_SIZE;
if (nr_allocs > file->f_inode->i_blocks - 1)
nr_allocs -= file->f_inode->i_blocks - 1;
else
nr_allocs = 0;
if (nr_allocs > sbi->nr_free_blocks)
return -ENOSPC;

err = block_write_begin(mapping, pos, len, foliop, simplefs_file_get_block);
if (err < 0)
pr_err("newly allocated blocks reclaim not implemented yet\n");
return err;
}
#elif SIMPLEFS_AT_LEAST(5, 19, 0)
static int simplefs_write_begin(struct file *file,
struct address_space *mapping,
Expand All @@ -178,26 +138,6 @@ static int simplefs_write_begin(struct file *file,
struct page **pagep,
void **fsdata)
{
struct simplefs_sb_info *sbi = SIMPLEFS_SB(file->f_inode->i_sb);
int err;
uint32_t nr_allocs = 0;

if (pos + len > SIMPLEFS_MAX_FILESIZE)
return -ENOSPC;

nr_allocs = max(pos + len, file->f_inode->i_size) / SIMPLEFS_BLOCK_SIZE;
if (nr_allocs > file->f_inode->i_blocks - 1)
nr_allocs -= file->f_inode->i_blocks - 1;
else
nr_allocs = 0;
if (nr_allocs > sbi->nr_free_blocks)
return -ENOSPC;

err = block_write_begin(mapping, pos, len, pagep, simplefs_file_get_block);
if (err < 0)
pr_err("newly allocated blocks reclaim not implemented yet\n");
return err;
}
#else
static int simplefs_write_begin(struct file *file,
struct address_space *mapping,
Expand All @@ -207,6 +147,7 @@ static int simplefs_write_begin(struct file *file,
struct page **pagep,
void **fsdata)
{
#endif
struct simplefs_sb_info *sbi = SIMPLEFS_SB(file->f_inode->i_sb);
int err;
uint32_t nr_allocs = 0;
Expand All @@ -221,14 +162,18 @@ static int simplefs_write_begin(struct file *file,
nr_allocs = 0;
if (nr_allocs > sbi->nr_free_blocks)
return -ENOSPC;

#if SIMPLEFS_AT_LEAST(6, 12, 0)
err = block_write_begin(mapping, pos, len, foliop, simplefs_file_get_block);
#elif SIMPLEFS_AT_LEAST(5, 19, 0)
err = block_write_begin(mapping, pos, len, pagep, simplefs_file_get_block);
#else
err = block_write_begin(mapping, pos, len, flags, pagep,
simplefs_file_get_block);
#endif
if (err < 0)
pr_err("newly allocated blocks reclaim not implemented yet\n");
return err;
}
#endif

/* Called by the VFS after writing data from a write() syscall to the page
* cache. This function updates inode metadata and truncates the file if
Expand Down
4 changes: 2 additions & 2 deletions simplefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ struct simplefs_inode {
#include <linux/version.h>
/* compatibility macros */
#define SIMPLEFS_AT_LEAST(major, minor, rev) \
LINUX_VERSION_CODE >= KERNEL_VERSION(major, minor, rev)
(LINUX_VERSION_CODE >= KERNEL_VERSION(major, minor, rev))
#define SIMPLEFS_LESS_EQUAL(major, minor, rev) \
LINUX_VERSION_CODE <= KERNEL_VERSION(major, minor, rev)
(LINUX_VERSION_CODE <= KERNEL_VERSION(major, minor, rev))

/* A 'container' structure that keeps the VFS inode and additional on-disk
* data.
Expand Down
Loading