A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

utags: fix build error on kernel 5.15

Browse source 
SM8550 product use kernel 5.15, and utags driver build errors:
1.BIO_MAX_PAGES has been rename to BIO_MAX_VECS
.../drivers/misc/utag/utags.c:171:41: error: use of undeclared identifier 'BIO_MAX_PAGES'
                   num = (left_pages >= BIO_MAX_PAGES) ? BIO_MAX_PAGES : left_pages;

2. get_fs and set_fs() are not exported from 5.15
drivers/misc/utag/utags.c:1268:7: error: implicit declaration of function 'get_fs' [-Werror,-Wim
           fs = get_fs();

3. uselss fp variable that is not used

Change-Id: Ia031b5042124a608cdcf956795bd2e0bd6844689
Reviewed-on: https://gerrit.mot.com/2237918
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
xizx 2022-04-09 17:34:46 +08:00 • committed by Zhenxin Xi
commit c3b0652d8c
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/misc/utag/utags.c
View file

@ -160,6 +160,12 @@ static struct page *addr_to_page(void *addr)
return virt_to_page(addr);
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
#define NR_BIO_MAX_PAGES BIO_MAX_VECS
#else
#define NR_BIO_MAX_PAGES BIO_MAX_PAGES
#endif
static int utags_submit_bio(struct block_device *bdev, void *buf, int pages, int opf)
{
int i, ret;
@ -168,7 +174,7 @@ static int utags_submit_bio(struct block_device *bdev, void *buf, int pages, int
pr_debug("%s: pages %d left_pages %d begin\n", __func__, pages, left_pages);
while (left_pages > 0) {
num = (left_pages >= BIO_MAX_PAGES) ? BIO_MAX_PAGES : left_pages;
num = (left_pages >= NR_BIO_MAX_PAGES) ? NR_BIO_MAX_PAGES : left_pages;
bio = bio_alloc(GFP_KERNEL, num);
if (!bio)
@ -1261,12 +1267,13 @@ static int store_utags(struct ctrl *ctrl, struct utag *tags)
size_t tags_size;
char *datap = NULL;
int rc = 0;
mm_segment_t fs;
struct file *fp;
struct blkdev *cb = &ctrl->main;
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
mm_segment_t fs;
fs = get_fs();
set_fs(KERNEL_DS);
#endif
pr_debug("[%s] utags partition blk_sz=%zu\n", ctrl->dir_name, cb->size);
@ -1280,7 +1287,6 @@ static int store_utags(struct ctrl *ctrl, struct utag *tags)
rc = -EIO;
goto err_free;
}
fp = cb->filep;
written = kernel_write_stub(cb, datap, tags_size);
if (written < tags_size) {
@ -1296,7 +1302,6 @@ static int store_utags(struct ctrl *ctrl, struct utag *tags)
rc = -EIO;
goto err_free;
}
fp = cb->filep;
written = kernel_write_stub(cb, datap, tags_size);
if (written < tags_size) {
@ -1309,7 +1314,9 @@ static int store_utags(struct ctrl *ctrl, struct utag *tags)
err_free:
vfree(datap);
out:
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
set_fs(fs);
#endif
return rc;
}