Skip to contentSkip to conversation

nilfs2-remove-nilfs_palloc_block_get_entry.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Nov 6, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: nilfs2: remove nilfs_palloc_block_get_entry()
has been removed from the -mm tree. Its filename was
nilfs2-remove-nilfs_palloc_block_get_entry.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Ryusuke Konishi <[email protected]>
Subject: nilfs2: remove nilfs_palloc_block_get_entry()
Date: Thu, 24 Oct 2024 18:25:41 +0900

All calls to nilfs_palloc_block_get_entry() are now gone, so remove it.

---

 fs/nilfs2/alloc.c |   19 -------------------
 fs/nilfs2/alloc.h |    2 --
 2 files changed, 21 deletions(-)
fs/nilfs2/alloc.c renamed from fs/nilfs2/alloc.c~nilfs2-remove-nilfs_palloc_block_get_entry +0 -19
@@ -391,25 +391,6 @@ size_t nilfs_palloc_entry_offset(const s
 }
 
 /**
- * nilfs_palloc_block_get_entry - get kernel address of an entry
- * @inode: inode of metadata file using this allocator
- * @nr: serial number of the entry (e.g. inode number)
- * @bh: buffer head of the buffer storing the entry block
- * @kaddr: kernel address mapped for the page including the buffer
- */
-void *nilfs_palloc_block_get_entry(const struct inode *inode, __u64 nr,
-				   const struct buffer_head *bh, void *kaddr)
-{
-	unsigned long entry_offset, group_offset;
-
-	nilfs_palloc_group(inode, nr, &group_offset);
-	entry_offset = group_offset % NILFS_MDT(inode)->mi_entries_per_block;
-
-	return kaddr + bh_offset(bh) +
-		entry_offset * NILFS_MDT(inode)->mi_entry_size;
-}
-
-/**
  * nilfs_palloc_find_available_slot - find available slot in a group
  * @bitmap: bitmap of the group
  * @target: offset number of an entry in the group (start point)
fs/nilfs2/alloc.h renamed from fs/nilfs2/alloc.h~nilfs2-remove-nilfs_palloc_block_get_entry +0 -2
@@ -31,8 +31,6 @@ nilfs_palloc_entries_per_group(const str
 int nilfs_palloc_init_blockgroup(struct inode *, unsigned int);
 int nilfs_palloc_get_entry_block(struct inode *, __u64, int,
 				 struct buffer_head **);
-void *nilfs_palloc_block_get_entry(const struct inode *, __u64,
-				   const struct buffer_head *, void *);
 size_t nilfs_palloc_entry_offset(const struct inode *inode, __u64 nr,
 				 const struct buffer_head *bh);
 

_

Patches currently in -mm which might be from [email protected] are