From nobody Mon Sep 28 11:40:33 2026 Received: from www262.sakura.ne.jp (www262.sakura.ne.jp [202.181.97.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5724B37D131 for ; Sat, 22 Aug 2026 14:54:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.181.97.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787410501; cv=none; b=LLmEXX0dNadYZlnQO8Qm/NIbSl98V3Od2KR4gd2fwyhI/cAGTz/AuNmcZLn+UxFdyXWGDKAcPPNjdvfJsGu/bDqZ3J3Vapm6PQ6PsnJyHCxqV5Dlzo7wUITjTzY2/ousfCilvByzSe7VNLN2KINMKawBmVLtOKb8KNxZKTwUr6E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787410501; c=relaxed/simple; bh=rtPCv9/Tjk/ts1MExopTlr6Xtsxab/cJPXOvQvw/Unk=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=DjSkvXiY7mx149dfaZJOa6/oasnDCWaJSPS4sttHcwEowZxxc9hpCfsCvUsR+CUlLlkcSijyVqcMONk0G6LmRdzdDfS26URiJJLIpul88ZCWcbX1QffKNh5xwqaiOPx//pu6/jackvVkLNQO0FA3hfL6uLWEJvYT57aPfxyEmuI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=I-love.SAKURA.ne.jp; spf=pass smtp.mailfrom=I-love.SAKURA.ne.jp; arc=none smtp.client-ip=202.181.97.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=I-love.SAKURA.ne.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=I-love.SAKURA.ne.jp Received: from www262.sakura.ne.jp (localhost [127.0.0.1]) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTP id 67MEstY2066894 for ; Sat, 22 Aug 2026 23:54:55 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Received: from [192.168.1.6] (M106072072000.v4.enabler.ne.jp [106.72.72.0]) (authenticated bits=0) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTPSA id 67MEstLh066891 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NO) for ; Sat, 22 Aug 2026 23:54:55 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Message-ID: Date: Sat, 22 Aug 2026 23:54:54 +0900 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: LKML From: Tetsuo Handa Subject: [PATCH v3.1] hpfs: fix coding style of fs/hpfs/inode.c Content-Transfer-Encoding: quoted-printable X-Anti-Virus-Server: fsav204.rs.sakura.ne.jp X-Virus-Status: clean Content-Type: text/plain; charset="utf-8" No functional change intended. Signed-off-by: Tetsuo Handa --- This is an attempt to get sashiko's review. Can sashiko.dev now properly ap= ply this patch? fs/hpfs/inode.c | 92 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c index 1b4fcf760aad..5d497e8b1f22 100644 --- a/fs/hpfs/inode.c +++ b/fs/hpfs/inode.c @@ -21,7 +21,7 @@ void hpfs_init_inode(struct inode *i) i->i_mode =3D hpfs_sb(sb)->sb_mode; i->i_size =3D -1; i->i_blocks =3D -1; -=09 + hpfs_inode->i_dno =3D 0; hpfs_inode->i_n_secs =3D 0; hpfs_inode->i_file_sec =3D 0; @@ -50,31 +50,37 @@ void hpfs_read_inode(struct inode *i) void *ea; int ea_size; =20 - if (!(fnode =3D hpfs_map_fnode(sb, i->i_ino, &bh))) { - /*i->i_mode |=3D S_IFREG; - i->i_mode &=3D ~0111; - i->i_op =3D &hpfs_file_iops; - i->i_fop =3D &hpfs_file_ops; - clear_nlink(i);*/ + fnode =3D hpfs_map_fnode(sb, i->i_ino, &bh); + if (!fnode) { + /* + * i->i_mode |=3D S_IFREG; + * i->i_mode &=3D ~0111; + * i->i_op =3D &hpfs_file_iops; + * i->i_fop =3D &hpfs_file_ops; + * clear_nlink(i); + */ make_bad_inode(i); return; } if (hpfs_sb(i->i_sb)->sb_eas) { - if ((ea =3D hpfs_get_ea(i->i_sb, fnode, "UID", &ea_size))) { + ea =3D hpfs_get_ea(i->i_sb, fnode, "UID", &ea_size); + if (ea) { if (ea_size =3D=3D 2) { - i_uid_write(i, le16_to_cpu(*(__le16*)ea)); + i_uid_write(i, le16_to_cpu(*(__le16 *)ea)); hpfs_inode->i_ea_uid =3D 1; } kfree(ea); } - if ((ea =3D hpfs_get_ea(i->i_sb, fnode, "GID", &ea_size))) { + ea =3D hpfs_get_ea(i->i_sb, fnode, "GID", &ea_size); + if (ea) { if (ea_size =3D=3D 2) { - i_gid_write(i, le16_to_cpu(*(__le16*)ea)); + i_gid_write(i, le16_to_cpu(*(__le16 *)ea)); hpfs_inode->i_ea_gid =3D 1; } kfree(ea); } - if ((ea =3D hpfs_get_ea(i->i_sb, fnode, "SYMLINK", &ea_size))) { + ea =3D hpfs_get_ea(i->i_sb, fnode, "SYMLINK", &ea_size); + if (ea) { kfree(ea); i->i_mode =3D S_IFLNK | 0777; i->i_op =3D &page_symlink_inode_operations; @@ -86,19 +92,22 @@ void hpfs_read_inode(struct inode *i) brelse(bh); return; } - if ((ea =3D hpfs_get_ea(i->i_sb, fnode, "MODE", &ea_size))) { + ea =3D hpfs_get_ea(i->i_sb, fnode, "MODE", &ea_size); + if (ea) { int rdev =3D 0; umode_t mode =3D hpfs_sb(sb)->sb_mode; + if (ea_size =3D=3D 2) { - mode =3D le16_to_cpu(*(__le16*)ea); + mode =3D le16_to_cpu(*(__le16 *)ea); hpfs_inode->i_ea_mode =3D 1; } kfree(ea); i->i_mode =3D mode; if (S_ISBLK(mode) || S_ISCHR(mode)) { - if ((ea =3D hpfs_get_ea(i->i_sb, fnode, "DEV", &ea_size))) { + ea =3D hpfs_get_ea(i->i_sb, fnode, "DEV", &ea_size); + if (ea) { if (ea_size =3D=3D 4) - rdev =3D le32_to_cpu(*(__le32*)ea); + rdev =3D le32_to_cpu(*(__le32 *)ea); kfree(ea); } } @@ -115,6 +124,7 @@ void hpfs_read_inode(struct inode *i) } if (fnode_is_dir(fnode)) { int n_dnodes, n_subdirs; + i->i_mode |=3D S_IFDIR; i->i_op =3D &hpfs_dir_iops; i->i_fop =3D &hpfs_dir_ops; @@ -122,7 +132,9 @@ void hpfs_read_inode(struct inode *i) hpfs_inode->i_dno =3D le32_to_cpu(fnode->u.external[0].disk_secno); if (hpfs_sb(sb)->sb_chk >=3D 2) { struct buffer_head *bh0; - if (hpfs_map_fnode(sb, hpfs_inode->i_parent_dir, &bh0)) brelse(bh0); + + if (hpfs_map_fnode(sb, hpfs_inode->i_parent_dir, &bh0)) + brelse(bh0); } n_dnodes =3D 0; n_subdirs =3D 0; hpfs_count_dnodes(i->i_sb, hpfs_inode->i_dno, &n_dnodes, &n_subdirs, NUL= L); @@ -131,7 +143,8 @@ void hpfs_read_inode(struct inode *i) set_nlink(i, 2 + n_subdirs); } else { i->i_mode |=3D S_IFREG; - if (!hpfs_inode->i_ea_mode) i->i_mode &=3D ~0111; + if (!hpfs_inode->i_ea_mode) + i->i_mode &=3D ~0111; i->i_op =3D &hpfs_file_iops; i->i_fop =3D &hpfs_file_ops; set_nlink(i, 1); @@ -146,15 +159,19 @@ void hpfs_read_inode(struct inode *i) static void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode) { struct hpfs_inode_info *hpfs_inode =3D hpfs_i(i); - /*if (le32_to_cpu(fnode->acl_size_l) || le16_to_cpu(fnode->acl_size_s)) { - Some unknown structures like ACL may be in fnode, - we'd better not overwrite them - hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 structures", i-= >i_ino); - } else*/ if (hpfs_sb(i->i_sb)->sb_eas >=3D 2) { + /* + * if (le32_to_cpu(fnode->acl_size_l) || le16_to_cpu(fnode->acl_size_s)) { + * Some unknown structures like ACL may be in fnode, + * we'd better not overwrite them + * hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 structures", = i->i_ino); + * } else + */ + if (hpfs_sb(i->i_sb)->sb_eas >=3D 2) { __le32 ea; + if (!uid_eq(i->i_uid, hpfs_sb(i->i_sb)->sb_uid) || hpfs_inode->i_ea_uid)= { ea =3D cpu_to_le32(i_uid_read(i)); - hpfs_set_ea(i, fnode, "UID", (char*)&ea, 2); + hpfs_set_ea(i, fnode, "UID", (char *)&ea, 2); hpfs_inode->i_ea_uid =3D 1; } if (!gid_eq(i->i_gid, hpfs_sb(i->i_sb)->sb_gid) || hpfs_inode->i_ea_gid)= { @@ -183,7 +200,9 @@ void hpfs_write_inode(struct inode *i) { struct hpfs_inode_info *hpfs_inode =3D hpfs_i(i); struct inode *parent; - if (i->i_ino =3D=3D hpfs_sb(i->i_sb)->sb_root) return; + + if (i->i_ino =3D=3D hpfs_sb(i->i_sb)->sb_root) + return; if (hpfs_inode->i_rddir_off && !icount_read_once(i)) { if (*hpfs_inode->i_rddir_off) pr_err("write_inode: some position still there\n"); @@ -213,20 +232,28 @@ void hpfs_write_inode_nolock(struct inode *i) struct fnode *fnode; struct quad_buffer_head qbh; struct hpfs_dirent *de; - if (i->i_ino =3D=3D hpfs_sb(i->i_sb)->sb_root) return; - if (!(fnode =3D hpfs_map_fnode(i->i_sb, i->i_ino, &bh))) return; + + if (i->i_ino =3D=3D hpfs_sb(i->i_sb)->sb_root) + return; + fnode =3D hpfs_map_fnode(i->i_sb, i->i_ino, &bh); + if (!fnode) + return; if (i->i_ino !=3D hpfs_sb(i->i_sb)->sb_root && i->i_nlink) { - if (!(de =3D map_fnode_dirent(i->i_sb, i->i_ino, fnode, &qbh))) { + de =3D map_fnode_dirent(i->i_sb, i->i_ino, fnode, &qbh); + if (!de) { brelse(bh); return; } - } else de =3D NULL; + } else + de =3D NULL; if (S_ISREG(i->i_mode)) { fnode->file_size =3D cpu_to_le32(i->i_size); - if (de) de->file_size =3D cpu_to_le32(i->i_size); + if (de) + de->file_size =3D cpu_to_le32(i->i_size); } else if (S_ISDIR(i->i_mode)) { fnode->file_size =3D cpu_to_le32(0); - if (de) de->file_size =3D cpu_to_le32(0); + if (de) + de->file_size =3D cpu_to_le32(0); } hpfs_write_inode_ea(i, fnode); if (de) { @@ -239,7 +266,8 @@ void hpfs_write_inode_nolock(struct inode *i) hpfs_brelse4(&qbh); } if (S_ISDIR(i->i_mode)) { - if ((de =3D map_dirent(i, hpfs_inode->i_dno, "\001\001", 2, NULL, &qbh))= ) { + de =3D map_dirent(i, hpfs_inode->i_dno, "\001\001", 2, NULL, &qbh); + if (de) { de->write_date =3D cpu_to_le32(gmt_to_local(i->i_sb, inode_get_mtime_se= c(i))); de->read_date =3D cpu_to_le32(gmt_to_local(i->i_sb, inode_get_atime_sec= (i))); de->creation_date =3D cpu_to_le32(gmt_to_local(i->i_sb, inode_get_ctime= _sec(i))); --=20 2.55.0