MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-09 10:55:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "jfs: Convert to bdev_open_by_dev()"

Browse Source 
This reverts commit 9641706cbb which is
commit 898c57f456 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Ic492873afc380526d2eca3276ec94c6c61156d30
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-08-30 08:11:11 +00:00
parent a1f8d07b9e
commit a8167db0c5
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/jfs/jfs_logmgr.c
View File

@ -1058,7 +1058,7 @@ void jfs_syncpt(struct jfs_log *log, int hard_sync)
int lmLogOpen(struct super_block *sb) int lmLogOpen(struct super_block *sb)
{ {
int rc; int rc;
struct bdev_handle *bdev_handle; struct block_device *bdev;
struct jfs_log *log; struct jfs_log *log;
struct jfs_sb_info *sbi = JFS_SBI(sb); struct jfs_sb_info *sbi = JFS_SBI(sb);
@ -1070,7 +1070,7 @@ int lmLogOpen(struct super_block *sb)
mutex_lock(&jfs_log_mutex); mutex_lock(&jfs_log_mutex);
list_for_each_entry(log, &jfs_external_logs, journal_list) { list_for_each_entry(log, &jfs_external_logs, journal_list) {
if (log->bdev_handle->bdev->bd_dev == sbi->logdev) { if (log->bdev->bd_dev == sbi->logdev) {
if (!uuid_equal(&log->uuid, &sbi->loguuid)) { if (!uuid_equal(&log->uuid, &sbi->loguuid)) {
jfs_warn("wrong uuid on JFS journal"); jfs_warn("wrong uuid on JFS journal");
mutex_unlock(&jfs_log_mutex); mutex_unlock(&jfs_log_mutex);
@ -1100,14 +1100,14 @@ int lmLogOpen(struct super_block *sb)
* file systems to log may have n-to-1 relationship; * file systems to log may have n-to-1 relationship;
*/ */
bdev_handle = bdev_open_by_dev(sbi->logdev, bdev = blkdev_get_by_dev(sbi->logdev, BLK_OPEN_READ | BLK_OPEN_WRITE,
BLK_OPEN_READ | BLK_OPEN_WRITE, log, NULL); log, NULL);
if (IS_ERR(bdev_handle)) { if (IS_ERR(bdev)) {
rc = PTR_ERR(bdev_handle); rc = PTR_ERR(bdev);
goto free; goto free;
} }
log->bdev_handle = bdev_handle; log->bdev = bdev;
uuid_copy(&log->uuid, &sbi->loguuid); uuid_copy(&log->uuid, &sbi->loguuid);
/* /*
@ -1141,7 +1141,7 @@ journal_found:
lbmLogShutdown(log); lbmLogShutdown(log);
close: /* close external log device */ close: /* close external log device */
bdev_release(bdev_handle); blkdev_put(bdev, log);
free: /* free log descriptor */ free: /* free log descriptor */
mutex_unlock(&jfs_log_mutex); mutex_unlock(&jfs_log_mutex);
@ -1162,7 +1162,7 @@ static int open_inline_log(struct super_block *sb)
init_waitqueue_head(&log->syncwait); init_waitqueue_head(&log->syncwait);
set_bit(log_INLINELOG, &log->flag); set_bit(log_INLINELOG, &log->flag);
log->bdev_handle = sb->s_bdev_handle; log->bdev = sb->s_bdev;
log->base = addressPXD(&JFS_SBI(sb)->logpxd); log->base = addressPXD(&JFS_SBI(sb)->logpxd);
log->size = lengthPXD(&JFS_SBI(sb)->logpxd) >> log->size = lengthPXD(&JFS_SBI(sb)->logpxd) >>
(L2LOGPSIZE - sb->s_blocksize_bits); (L2LOGPSIZE - sb->s_blocksize_bits);
@ -1436,7 +1436,7 @@ int lmLogClose(struct super_block *sb)
{ {
struct jfs_sb_info *sbi = JFS_SBI(sb); struct jfs_sb_info *sbi = JFS_SBI(sb);
struct jfs_log *log = sbi->log; struct jfs_log *log = sbi->log;
struct bdev_handle *bdev_handle; struct block_device *bdev;
int rc = 0; int rc = 0;
jfs_info("lmLogClose: log:0x%p", log); jfs_info("lmLogClose: log:0x%p", log);
@ -1482,10 +1482,10 @@ int lmLogClose(struct super_block *sb)
* external log as separate logical volume * external log as separate logical volume
*/ */
list_del(&log->journal_list); list_del(&log->journal_list);
bdev_handle = log->bdev_handle; bdev = log->bdev;
rc = lmLogShutdown(log); rc = lmLogShutdown(log);
bdev_release(bdev_handle); blkdev_put(bdev, log);
kfree(log); kfree(log);
@ -1972,7 +1972,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
bp->l_flag |= lbmREAD; bp->l_flag |= lbmREAD;
bio = bio_alloc(log->bdev_handle->bdev, 1, REQ_OP_READ, GFP_NOFS); bio = bio_alloc(log->bdev, 1, REQ_OP_READ, GFP_NOFS);
bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
__bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset); __bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
BUG_ON(bio->bi_iter.bi_size != LOGPSIZE); BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
@ -2113,8 +2113,7 @@ static void lbmStartIO(struct lbuf * bp)
jfs_info("lbmStartIO"); jfs_info("lbmStartIO");
bio = bio_alloc(log->bdev_handle->bdev, 1, REQ_OP_WRITE | REQ_SYNC, bio = bio_alloc(log->bdev, 1, REQ_OP_WRITE | REQ_SYNC, GFP_NOFS);
GFP_NOFS);
bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
__bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset); __bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
BUG_ON(bio->bi_iter.bi_size != LOGPSIZE); BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);

2
fs/jfs/jfs_logmgr.h
View File

@ -356,7 +356,7 @@ struct jfs_log {
* before writing syncpt. * before writing syncpt.
*/ */
struct list_head journal_list; /* Global list */ struct list_head journal_list; /* Global list */
struct bdev_handle *bdev_handle; /* 4: log lv pointer */ struct block_device *bdev; /* 4: log lv pointer */
int serial; /* 4: log mount serial number */ int serial; /* 4: log mount serial number */
s64 base; /* @8: log extent address (inline log ) */ s64 base; /* @8: log extent address (inline log ) */

3
fs/jfs/jfs_mount.c
View File

@ -430,8 +430,7 @@ int updateSuper(struct super_block *sb, uint state)
if (state == FM_MOUNT) { if (state == FM_MOUNT) {
/* record log's dev_t and mount serial number */ /* record log's dev_t and mount serial number */
j_sb->s_logdev = cpu_to_le32( j_sb->s_logdev = cpu_to_le32(new_encode_dev(sbi->log->bdev->bd_dev));
new_encode_dev(sbi->log->bdev_handle->bdev->bd_dev));
j_sb->s_logserial = cpu_to_le32(sbi->log->serial); j_sb->s_logserial = cpu_to_le32(sbi->log->serial);
} else if (state == FM_CLEAN) { } else if (state == FM_CLEAN) {
/* /*