| Message ID | 53dd687535024df91147d1c30124330d1a5c985c.1746734745.git.ritesh.list@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ext4: Add multi-fsblock atomic write support with bigalloc | expand |
On Fri, May 09, 2025 at 02:20:33AM +0530, Ritesh Harjani (IBM) wrote: > Let's make ext4_meta_trans_blocks() non-static for use in later > functions during ->end_io conversion for atomic writes. > We will need this function to estimate journal credits for a special > case. Instead of adding another wrapper around it, let's make this > non-static. > > Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Looks good Ritesh. Feel free to add: Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> > --- > fs/ext4/ext4.h | 2 ++ > fs/ext4/inode.c | 6 +----- > 2 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > index c0240f6f6491..e2b36a3c1b0f 100644 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@ -3039,6 +3039,8 @@ extern void ext4_set_aops(struct inode *inode); > extern int ext4_writepage_trans_blocks(struct inode *); > extern int ext4_normal_submit_inode_data_buffers(struct jbd2_inode *jinode); > extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks); > +extern int ext4_meta_trans_blocks(struct inode *inode, int lblocks, > + int pextents); > extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode, > loff_t lstart, loff_t lend); > extern vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf); > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index b10e5cd5bb5c..2f99b087a5d8 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -142,9 +142,6 @@ static inline int ext4_begin_ordered_truncate(struct inode *inode, > new_size); > } > > -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks, > - int pextents); > - > /* > * Test whether an inode is a fast symlink. > * A fast symlink has its symlink data stored in ext4_inode_info->i_data. > @@ -5777,8 +5774,7 @@ static int ext4_index_trans_blocks(struct inode *inode, int lblocks, > * > * Also account for superblock, inode, quota and xattr blocks > */ > -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks, > - int pextents) > +int ext4_meta_trans_blocks(struct inode *inode, int lblocks, int pextents) > { > ext4_group_t groups, ngroups = ext4_get_groups_count(inode->i_sb); > int gdpblocks; > -- > 2.49.0 >
On Fri, May 09, 2025 at 02:20:33AM +0530, Ritesh Harjani (IBM) wrote: > Let's make ext4_meta_trans_blocks() non-static for use in later > functions during ->end_io conversion for atomic writes. > We will need this function to estimate journal credits for a special > case. Instead of adding another wrapper around it, let's make this > non-static. > > Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Acked-by: "Darrick J. Wong" <djwong@kernel.org> --D > --- > fs/ext4/ext4.h | 2 ++ > fs/ext4/inode.c | 6 +----- > 2 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > index c0240f6f6491..e2b36a3c1b0f 100644 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@ -3039,6 +3039,8 @@ extern void ext4_set_aops(struct inode *inode); > extern int ext4_writepage_trans_blocks(struct inode *); > extern int ext4_normal_submit_inode_data_buffers(struct jbd2_inode *jinode); > extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks); > +extern int ext4_meta_trans_blocks(struct inode *inode, int lblocks, > + int pextents); > extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode, > loff_t lstart, loff_t lend); > extern vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf); > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index b10e5cd5bb5c..2f99b087a5d8 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -142,9 +142,6 @@ static inline int ext4_begin_ordered_truncate(struct inode *inode, > new_size); > } > > -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks, > - int pextents); > - > /* > * Test whether an inode is a fast symlink. > * A fast symlink has its symlink data stored in ext4_inode_info->i_data. > @@ -5777,8 +5774,7 @@ static int ext4_index_trans_blocks(struct inode *inode, int lblocks, > * > * Also account for superblock, inode, quota and xattr blocks > */ > -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks, > - int pextents) > +int ext4_meta_trans_blocks(struct inode *inode, int lblocks, int pextents) > { > ext4_group_t groups, ngroups = ext4_get_groups_count(inode->i_sb); > int gdpblocks; > -- > 2.49.0 > >
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index c0240f6f6491..e2b36a3c1b0f 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3039,6 +3039,8 @@ extern void ext4_set_aops(struct inode *inode); extern int ext4_writepage_trans_blocks(struct inode *); extern int ext4_normal_submit_inode_data_buffers(struct jbd2_inode *jinode); extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks); +extern int ext4_meta_trans_blocks(struct inode *inode, int lblocks, + int pextents); extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode, loff_t lstart, loff_t lend); extern vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index b10e5cd5bb5c..2f99b087a5d8 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -142,9 +142,6 @@ static inline int ext4_begin_ordered_truncate(struct inode *inode, new_size); } -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks, - int pextents); - /* * Test whether an inode is a fast symlink. * A fast symlink has its symlink data stored in ext4_inode_info->i_data. @@ -5777,8 +5774,7 @@ static int ext4_index_trans_blocks(struct inode *inode, int lblocks, * * Also account for superblock, inode, quota and xattr blocks */ -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks, - int pextents) +int ext4_meta_trans_blocks(struct inode *inode, int lblocks, int pextents) { ext4_group_t groups, ngroups = ext4_get_groups_count(inode->i_sb); int gdpblocks;
Let's make ext4_meta_trans_blocks() non-static for use in later functions during ->end_io conversion for atomic writes. We will need this function to estimate journal credits for a special case. Instead of adding another wrapper around it, let's make this non-static. Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> --- fs/ext4/ext4.h | 2 ++ fs/ext4/inode.c | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-)