Skip to content

Support Linux 6.12 #75

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
merged 1 commit into from
Jul 27, 2025
Merged

Support Linux 6.12 #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 26 additions & 2 deletions file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,14 @@ static int simplefs_writepage(struct page *page, struct writeback_control *wbc)
* the data into the page cache. This function checks if the write operation
* can complete and allocates the necessary blocks through block_write_begin().
*/
#if SIMPLEFS_AT_LEAST(5, 19, 0)
#if SIMPLEFS_AT_LEAST(6, 12, 0)
static int simplefs_write_begin(struct file *file,
struct address_space *mapping,
loff_t pos,
unsigned int len,
struct folio **foliop,
void **fsdata)
#elif SIMPLEFS_AT_LEAST(5, 19, 0)
static int simplefs_write_begin(struct file *file,
struct address_space *mapping,
loff_t pos,
Expand Down Expand Up @@ -147,7 +154,9 @@ static int simplefs_write_begin(struct file *file,
return -ENOSPC;

/* prepare the write */
#if SIMPLEFS_AT_LEAST(5, 19, 0)
#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,
Expand All @@ -163,13 +172,23 @@ static int simplefs_write_begin(struct file *file,
* cache. This function updates inode metadata and truncates the file if
* necessary.
*/
#if SIMPLEFS_AT_LEAST(6, 12, 0)
static int simplefs_write_end(struct file *file,
struct address_space *mapping,
loff_t pos,
unsigned int len,
unsigned int copied,
struct folio *foliop,
void *fsdata)
#else
static int simplefs_write_end(struct file *file,
struct address_space *mapping,
loff_t pos,
unsigned int len,
unsigned int copied,
struct page *page,
void *fsdata)
#endif
{
struct inode *inode = file->f_inode;
struct simplefs_inode_info *ci = SIMPLEFS_INODE(inode);
Expand All @@ -180,7 +199,12 @@ static int simplefs_write_end(struct file *file,
uint32_t nr_blocks_old;

/* Complete the write() */
#if SIMPLEFS_AT_LEAST(6, 12, 0)
int ret =
generic_write_end(file, mapping, pos, len, copied, foliop, fsdata);
#else
int ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);
#endif
if (ret < len) {
pr_err("wrote less than requested.");
return ret;
Expand Down