From nobody Fri May 8 06:53:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EFCAC433EF for ; Mon, 9 May 2022 07:25:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234614AbiEIHYg (ORCPT ); Mon, 9 May 2022 03:24:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236047AbiEIHQP (ORCPT ); Mon, 9 May 2022 03:16:15 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12C6015EE6D; Mon, 9 May 2022 00:12:21 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id m20so24942575ejj.10; Mon, 09 May 2022 00:12:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0NzH5IQuyQjQcDdtQzR+WrAuHxHFXz1NNkXI6gU8GFQ=; b=JF5fhliRWIc4nGY+zA67ZXiiNB8MCZnpWJwKgHCM6F2V7mn2CqxQePYcvKlAj3bLC1 JRUBT0RAloMUx0QqIuz0a9HWImqOQjgHU6cdSAF4aDjuI603+qPQST/QBLb8DX2pZvuB Km6Yvcgq/HsEsLEMpU1q70UBWaUlSGPVAQ7pZ/yR2bBtDXacnOwduOsLwsBXSArksNhf DfBJ1iZCBhO1lnmicQiI12q791heG0XTbKHC1fgImm8/S+QH69LMFo+CDUeNBhB1H2QU Z5HJ5e5+1etAngO0vwIhO107R594jSBtWFmV+WjBBxCjeoNc/iijPhGEghgFZ73C92tO JStQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0NzH5IQuyQjQcDdtQzR+WrAuHxHFXz1NNkXI6gU8GFQ=; b=shsR6RllsOQP4sWTz8fSu2EwKazyz2S8wa47sq+K3reuiSvL9c2XriqMbT8TP5MH3L 37wlR9vm25qDus0iT25s8X40lul9fMa9pKGh9SGPAoEKUgHpRY4A1+iVo4Rnw2lcJ11b I2B4rVMAECoQBvnSw1dSb7HhwE+ESe2JugfFZjXZMwhKXOHGLgCcQ70RhqEV1vT3dSLT bXaDeuqE/jRof+6jdwSERhI9kiO1catKliejFVeEBc9+6ydwSwsrs/TMoQZdb93gJYO0 Zis87QMlMjw9W4JOqj35crvW1bFn0FEeWQmhUvD2nNs46s6O5aKFmXG/F459R88jp2Y+ Y5CA== X-Gm-Message-State: AOAM533s7MmB0KDpbxMXs4AySSovpKjxvnIlNE8Uub7/NjkVIwIpOAhg 7l5g76iXcYBIfBc5X2b2Ji8= X-Google-Smtp-Source: ABdhPJzSJXVEHTJFK5ODTEXZxkYbCbOEXkyVXm24NMdHGK8KSo06TKe9tptYUtXU89YLlRPSmvLQcA== X-Received: by 2002:a17:907:7ea9:b0:6f3:de9c:c6fb with SMTP id qb41-20020a1709077ea900b006f3de9cc6fbmr13488863ejc.304.1652080334741; Mon, 09 May 2022 00:12:14 -0700 (PDT) Received: from localhost.localdomain (host-79-53-109-4.retail.telecomitalia.it. [79.53.109.4]) by smtp.gmail.com with ESMTPSA id i12-20020a1709063c4c00b006f3ef214dbcsm4767818ejg.34.2022.05.09.00.12.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 00:12:12 -0700 (PDT) From: "Fabio M. De Francesco" To: Evgeniy Dushistov , Alexander Viro , Ira Weiny , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" Subject: [PATCH v2] fs/ufs: Replace kmap() with kmap_local_page() Date: Mon, 9 May 2022 09:12:07 +0200 Message-Id: <20220509071207.16176-1-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The use of kmap() is being deprecated in favor of kmap_local_page(). With kmap_local_page(), the mapping is thread-local, CPU-local and not globally visible. The usage of kmap_local_page() in fs/ufs is thread-local, therefore replace kmap() / kunmap() calls with kmap_local_page() / kunmap_local(). kunmap_local() requires the mapping address, so return that address from ufs_get_page() to be used in ufs_put_page(). These changes are essentially ported from fs/ext2 and relie largely on commit 782b76d7abdf ("fs/ext2: Replace kmap() with kmap_local_page()"). Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco Reviewed-by: Ira Weiny --- v1 -> v2: Correct some style's issues reported by checkpatch.pl. Remove "inline" compiler directive from fs/ufs/ufs.h, Reported-by: kernel test robot fs/ufs/dir.c | 116 +++++++++++++++++++++++++++++++------------------ fs/ufs/namei.c | 38 ++++++++-------- fs/ufs/ufs.h | 12 +++-- 3 files changed, 102 insertions(+), 64 deletions(-) diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index b721d0bda5e5..39e81547ebb9 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c @@ -61,9 +61,9 @@ static int ufs_commit_chunk(struct page *page, loff_t pos= , unsigned len) return err; } =20 -static inline void ufs_put_page(struct page *page) +inline void ufs_put_page(struct page *page, void *page_addr) { - kunmap(page); + kunmap_local(page_addr); put_page(page); } =20 @@ -72,11 +72,12 @@ ino_t ufs_inode_by_name(struct inode *dir, const struct= qstr *qstr) ino_t res =3D 0; struct ufs_dir_entry *de; struct page *page; -=09 - de =3D ufs_find_entry(dir, qstr, &page); + void *page_addr; + + de =3D ufs_find_entry(dir, qstr, &page, &page_addr); if (de) { res =3D fs32_to_cpu(dir->i_sb, de->d_ino); - ufs_put_page(page); + ufs_put_page(page, page_addr); } return res; } @@ -84,11 +85,11 @@ ino_t ufs_inode_by_name(struct inode *dir, const struct= qstr *qstr) =20 /* Releases the page */ void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de, - struct page *page, struct inode *inode, - bool update_times) + struct page *page, void *page_addr, + struct inode *inode, bool update_times) { loff_t pos =3D page_offset(page) + - (char *) de - (char *) page_address(page); + (char *)de - (char *)page_addr; unsigned len =3D fs16_to_cpu(dir->i_sb, de->d_reclen); int err; =20 @@ -100,18 +101,17 @@ void ufs_set_link(struct inode *dir, struct ufs_dir_e= ntry *de, ufs_set_de_type(dir->i_sb, de, inode->i_mode); =20 err =3D ufs_commit_chunk(page, pos, len); - ufs_put_page(page); + ufs_put_page(page, page_addr); if (update_times) dir->i_mtime =3D dir->i_ctime =3D current_time(dir); mark_inode_dirty(dir); } =20 =20 -static bool ufs_check_page(struct page *page) +static bool ufs_check_page(struct page *page, char *kaddr) { struct inode *dir =3D page->mapping->host; struct super_block *sb =3D dir->i_sb; - char *kaddr =3D page_address(page); unsigned offs, rec_len; unsigned limit =3D PAGE_SIZE; const unsigned chunk_mask =3D UFS_SB(sb)->s_uspi->s_dirblksize - 1; @@ -186,21 +186,28 @@ static bool ufs_check_page(struct page *page) return false; } =20 -static struct page *ufs_get_page(struct inode *dir, unsigned long n) +/* + * Calls to ufs_get_page()/ufs_put_page() must be nested according to the + * rules documented in kmap_local_page()/kunmap_local(). + * + * NOTE: ufs_find_entry() and ufs_dotdot() act as calls to ufs_get_page() + * and must be treated accordingly for nesting purposes. + */ +static struct page *ufs_get_page(struct inode *dir, unsigned long n, void = **page_addr) { struct address_space *mapping =3D dir->i_mapping; struct page *page =3D read_mapping_page(mapping, n, NULL); if (!IS_ERR(page)) { - kmap(page); + *page_addr =3D kmap_local_page(page); if (unlikely(!PageChecked(page))) { - if (PageError(page) || !ufs_check_page(page)) + if (PageError(page) || !ufs_check_page(page, *page_addr)) goto fail; } } return page; =20 fail: - ufs_put_page(page); + ufs_put_page(page, *page_addr); return ERR_PTR(-EIO); } =20 @@ -226,15 +233,29 @@ ufs_next_entry(struct super_block *sb, struct ufs_dir= _entry *p) fs16_to_cpu(sb, p->d_reclen)); } =20 -struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p) +/* + * Return the '..' directory entry and the page in which the entry was fou= nd + * (as a parameter - p). + * + * On Success ufs_put_page() should be called on *p. + * + * NOTE: Calls to ufs_get_page()/ufs_put_page() must be nested according to + * the rules documented in kmap_local_page()/kunmap_local(). + * + * ufs_find_entry() and ufs_dotdot() act as calls to ufs_get_page() and + * must be treated accordingly for nesting purposes. + */ +struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p, void = **pa) { - struct page *page =3D ufs_get_page(dir, 0); + void *page_addr; + struct page *page =3D ufs_get_page(dir, 0, &page_addr); struct ufs_dir_entry *de =3D NULL; =20 if (!IS_ERR(page)) { de =3D ufs_next_entry(dir->i_sb, - (struct ufs_dir_entry *)page_address(page)); + (struct ufs_dir_entry *)page_addr); *p =3D page; + *pa =3D page_addr; } return de; } @@ -246,9 +267,17 @@ struct ufs_dir_entry *ufs_dotdot(struct inode *dir, st= ruct page **p) * returns the page in which the entry was found, and the entry itself * (as a parameter - res_dir). Page is returned mapped and unlocked. * Entry is guaranteed to be valid. + * + * On Success ufs_put_page() should be called on *res_page. + * + * NOTE: Calls to ufs_get_page()/ufs_put_page() must be nested according to + * the rules documented in kmap_local_page()/kunmap_local(). + * + * ufs_find_entry() and ufs_dotdot() act as calls to ufs_get_page() and + * must be treated accordingly for nesting purposes. */ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr = *qstr, - struct page **res_page) + struct page **res_page, void **res_page_addr) { struct super_block *sb =3D dir->i_sb; const unsigned char *name =3D qstr->name; @@ -259,6 +288,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir,= const struct qstr *qstr, struct page *page =3D NULL; struct ufs_inode_info *ui =3D UFS_I(dir); struct ufs_dir_entry *de; + void *page_addr; =20 UFSD("ENTER, dir_ino %lu, name %s, namlen %u\n", dir->i_ino, name, namele= n); =20 @@ -267,6 +297,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir,= const struct qstr *qstr, =20 /* OFFSET_CACHE */ *res_page =3D NULL; + *res_page_addr =3D NULL; =20 start =3D ui->i_dir_start_lookup; =20 @@ -275,9 +306,10 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir= , const struct qstr *qstr, n =3D start; do { char *kaddr; - page =3D ufs_get_page(dir, n); + + page =3D ufs_get_page(dir, n, &page_addr); if (!IS_ERR(page)) { - kaddr =3D page_address(page); + kaddr =3D page_addr; de =3D (struct ufs_dir_entry *) kaddr; kaddr +=3D ufs_last_byte(dir, n) - reclen; while ((char *) de <=3D kaddr) { @@ -285,7 +317,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir,= const struct qstr *qstr, goto found; de =3D ufs_next_entry(sb, de); } - ufs_put_page(page); + ufs_put_page(page, page_addr); } if (++n >=3D npages) n =3D 0; @@ -295,6 +327,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir,= const struct qstr *qstr, =20 found: *res_page =3D page; + *res_page_addr =3D page_addr; ui->i_dir_start_lookup =3D n; return de; } @@ -312,6 +345,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *i= node) const unsigned int chunk_size =3D UFS_SB(sb)->s_uspi->s_dirblksize; unsigned short rec_len, name_len; struct page *page =3D NULL; + void *page_addr =3D NULL; struct ufs_dir_entry *de; unsigned long npages =3D dir_pages(dir); unsigned long n; @@ -329,12 +363,12 @@ int ufs_add_link(struct dentry *dentry, struct inode = *inode) for (n =3D 0; n <=3D npages; n++) { char *dir_end; =20 - page =3D ufs_get_page(dir, n); + page =3D ufs_get_page(dir, n, &page_addr); err =3D PTR_ERR(page); if (IS_ERR(page)) goto out; lock_page(page); - kaddr =3D page_address(page); + kaddr =3D page_addr; dir_end =3D kaddr + ufs_last_byte(dir, n); de =3D (struct ufs_dir_entry *)kaddr; kaddr +=3D PAGE_SIZE - reclen; @@ -365,14 +399,14 @@ int ufs_add_link(struct dentry *dentry, struct inode = *inode) de =3D (struct ufs_dir_entry *) ((char *) de + rec_len); } unlock_page(page); - ufs_put_page(page); + ufs_put_page(page, page_addr); } BUG(); return -EINVAL; =20 got_it: pos =3D page_offset(page) + - (char*)de - (char*)page_address(page); + (char *)de - (char *)page_addr; err =3D ufs_prepare_chunk(page, pos, rec_len); if (err) goto out_unlock; @@ -396,7 +430,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *i= node) mark_inode_dirty(dir); /* OFFSET_CACHE */ out_put: - ufs_put_page(page); + ufs_put_page(page, page_addr); out: return err; out_unlock: @@ -441,7 +475,7 @@ ufs_readdir(struct file *file, struct dir_context *ctx) char *kaddr, *limit; struct ufs_dir_entry *de; =20 - struct page *page =3D ufs_get_page(inode, n); + struct page *page =3D ufs_get_page(inode, n, (void **)&kaddr); =20 if (IS_ERR(page)) { ufs_error(sb, __func__, @@ -450,7 +484,6 @@ ufs_readdir(struct file *file, struct dir_context *ctx) ctx->pos +=3D PAGE_SIZE - offset; return -EIO; } - kaddr =3D page_address(page); if (unlikely(need_revalidate)) { if (offset) { offset =3D ufs_validate_entry(sb, kaddr, offset, chunk_mask); @@ -476,13 +509,13 @@ ufs_readdir(struct file *file, struct dir_context *ct= x) ufs_get_de_namlen(sb, de), fs32_to_cpu(sb, de->d_ino), d_type)) { - ufs_put_page(page); + ufs_put_page(page, kaddr); return 0; } } ctx->pos +=3D fs16_to_cpu(sb, de->d_reclen); } - ufs_put_page(page); + ufs_put_page(page, kaddr); } return 0; } @@ -493,10 +526,9 @@ ufs_readdir(struct file *file, struct dir_context *ctx) * previous entry. */ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir, - struct page * page) + struct page *page, char *kaddr) { struct super_block *sb =3D inode->i_sb; - char *kaddr =3D page_address(page); unsigned from =3D ((char*)dir - kaddr) & ~(UFS_SB(sb)->s_uspi->s_dirblksi= ze - 1); unsigned to =3D ((char*)dir - kaddr) + fs16_to_cpu(sb, dir->d_reclen); loff_t pos; @@ -522,7 +554,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_di= r_entry *dir, de =3D ufs_next_entry(sb, de); } if (pde) - from =3D (char*)pde - (char*)page_address(page); + from =3D (char *)pde - kaddr; =20 pos =3D page_offset(page) + from; lock_page(page); @@ -535,7 +567,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_di= r_entry *dir, inode->i_ctime =3D inode->i_mtime =3D current_time(inode); mark_inode_dirty(inode); out: - ufs_put_page(page); + ufs_put_page(page, kaddr); UFSD("EXIT\n"); return err; } @@ -559,8 +591,7 @@ int ufs_make_empty(struct inode * inode, struct inode *= dir) goto fail; } =20 - kmap(page); - base =3D (char*)page_address(page); + base =3D kmap_local_page(page); memset(base, 0, PAGE_SIZE); =20 de =3D (struct ufs_dir_entry *) base; @@ -577,7 +608,7 @@ int ufs_make_empty(struct inode * inode, struct inode *= dir) de->d_reclen =3D cpu_to_fs16(sb, chunk_size - UFS_DIR_REC_LEN(1)); ufs_set_de_namlen(sb, de, 2); strcpy (de->d_name, ".."); - kunmap(page); + kunmap_local(base); =20 err =3D ufs_commit_chunk(page, 0, chunk_size); fail: @@ -592,17 +623,18 @@ int ufs_empty_dir(struct inode * inode) { struct super_block *sb =3D inode->i_sb; struct page *page =3D NULL; + void *page_addr; unsigned long i, npages =3D dir_pages(inode); =20 for (i =3D 0; i < npages; i++) { char *kaddr; struct ufs_dir_entry *de; - page =3D ufs_get_page(inode, i); =20 + page =3D ufs_get_page(inode, i, &page_addr); if (IS_ERR(page)) continue; =20 - kaddr =3D page_address(page); + kaddr =3D page_addr; de =3D (struct ufs_dir_entry *)kaddr; kaddr +=3D ufs_last_byte(inode, i) - UFS_DIR_REC_LEN(1); =20 @@ -629,12 +661,12 @@ int ufs_empty_dir(struct inode * inode) } de =3D ufs_next_entry(sb, de); } - ufs_put_page(page); + ufs_put_page(page, page_addr); } return 1; =20 not_empty: - ufs_put_page(page); + ufs_put_page(page, page_addr); return 0; } =20 diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c index 29d5a0e0c8f0..bc7060d10dd2 100644 --- a/fs/ufs/namei.c +++ b/fs/ufs/namei.c @@ -210,13 +210,14 @@ static int ufs_unlink(struct inode *dir, struct dentr= y *dentry) struct inode * inode =3D d_inode(dentry); struct ufs_dir_entry *de; struct page *page; + void *page_addr; int err =3D -ENOENT; =20 - de =3D ufs_find_entry(dir, &dentry->d_name, &page); + de =3D ufs_find_entry(dir, &dentry->d_name, &page, &page_addr); if (!de) goto out; =20 - err =3D ufs_delete_entry(dir, de, page); + err =3D ufs_delete_entry(dir, de, page, page_addr); if (err) goto out; =20 @@ -250,27 +251,31 @@ static int ufs_rename(struct user_namespace *mnt_user= ns, struct inode *old_dir, struct inode *old_inode =3D d_inode(old_dentry); struct inode *new_inode =3D d_inode(new_dentry); struct page *dir_page =3D NULL; + void *dir_page_addr; struct ufs_dir_entry * dir_de =3D NULL; struct page *old_page; + void *old_page_addr; struct ufs_dir_entry *old_de; int err =3D -ENOENT; =20 if (flags & ~RENAME_NOREPLACE) return -EINVAL; =20 - old_de =3D ufs_find_entry(old_dir, &old_dentry->d_name, &old_page); + old_de =3D ufs_find_entry(old_dir, &old_dentry->d_name, &old_page, + &old_page_addr); if (!old_de) goto out; =20 if (S_ISDIR(old_inode->i_mode)) { err =3D -EIO; - dir_de =3D ufs_dotdot(old_inode, &dir_page); + dir_de =3D ufs_dotdot(old_inode, &dir_page, &dir_page_addr); if (!dir_de) goto out_old; } =20 if (new_inode) { struct page *new_page; + void *page_addr; struct ufs_dir_entry *new_de; =20 err =3D -ENOTEMPTY; @@ -278,10 +283,11 @@ static int ufs_rename(struct user_namespace *mnt_user= ns, struct inode *old_dir, goto out_dir; =20 err =3D -ENOENT; - new_de =3D ufs_find_entry(new_dir, &new_dentry->d_name, &new_page); + new_de =3D ufs_find_entry(new_dir, &new_dentry->d_name, &new_page, + &page_addr); if (!new_de) goto out_dir; - ufs_set_link(new_dir, new_de, new_page, old_inode, 1); + ufs_set_link(new_dir, new_de, new_page, page_addr, old_inode, 1); new_inode->i_ctime =3D current_time(new_inode); if (dir_de) drop_nlink(new_inode); @@ -300,29 +306,25 @@ static int ufs_rename(struct user_namespace *mnt_user= ns, struct inode *old_dir, */ old_inode->i_ctime =3D current_time(old_inode); =20 - ufs_delete_entry(old_dir, old_de, old_page); + ufs_delete_entry(old_dir, old_de, old_page, old_page_addr); mark_inode_dirty(old_inode); =20 if (dir_de) { if (old_dir !=3D new_dir) - ufs_set_link(old_inode, dir_de, dir_page, new_dir, 0); - else { - kunmap(dir_page); - put_page(dir_page); - } + ufs_set_link(old_inode, dir_de, dir_page, + dir_page_addr, new_dir, 0); + else + ufs_put_page(dir_page, dir_page_addr); inode_dec_link_count(old_dir); } return 0; =20 =20 out_dir: - if (dir_de) { - kunmap(dir_page); - put_page(dir_page); - } + if (dir_de) + ufs_put_page(dir_page, dir_page_addr); out_old: - kunmap(old_page); - put_page(old_page); + ufs_put_page(old_page, old_page_addr); out: return err; } diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h index 550f7c5a3636..20d224c163ab 100644 --- a/fs/ufs/ufs.h +++ b/fs/ufs/ufs.h @@ -102,12 +102,16 @@ extern const struct inode_operations ufs_dir_inode_op= erations; extern int ufs_add_link (struct dentry *, struct inode *); extern ino_t ufs_inode_by_name(struct inode *, const struct qstr *); extern int ufs_make_empty(struct inode *, struct inode *); -extern struct ufs_dir_entry *ufs_find_entry(struct inode *, const struct q= str *, struct page **); -extern int ufs_delete_entry(struct inode *, struct ufs_dir_entry *, struct= page *); +extern struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struc= t qstr *qstr, + struct page **res_page, void **res_page_addr); +extern int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir, + struct page *page, char *kaddr); extern int ufs_empty_dir (struct inode *); -extern struct ufs_dir_entry *ufs_dotdot(struct inode *, struct page **); +extern struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p= , void **pa); extern void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de, - struct page *page, struct inode *inode, bool update_times); + struct page *page, void *page_addr, + struct inode *inode, bool update_times); +extern void ufs_put_page(struct page *page, void *page_addr); =20 /* file.c */ extern const struct inode_operations ufs_file_inode_operations; --=20 2.34.1