95 lines
3.5 KiB
Diff
95 lines
3.5 KiB
Diff
|
From acaa814953273827f380262ba900f0d50a95bee2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Darrick J. Wong" <darrick.wong@oracle.com>
|
||
|
|
Date: Tue, 10 Nov 2020 15:13:50 -0500
|
||
|
|
Subject: [PATCH] xfs: move xfs_log_dinode_to_disk to the log recovery code
|
||
|
|
|
||
|
|
Source kernel commit: 88947ea0ba713c9b74b212755b3b58242f0e7a56
|
||
|
|
|
||
|
|
Move this function to xfs_inode_item_recover.c since there's only one
|
||
|
|
caller of it.
|
||
|
|
|
||
|
|
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
|
||
|
|
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
||
|
|
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
|
||
|
|
Reviewed-by: Gao Xiang <hsiangkao@redhat.com>
|
||
|
|
Reviewed-by: Dave Chinner <dchinner@redhat.com>
|
||
|
|
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
|
||
|
|
index 975f097..f80ce10 100644
|
||
|
|
--- a/libxfs/xfs_inode_buf.c
|
||
|
|
+++ b/libxfs/xfs_inode_buf.c
|
||
|
|
@@ -318,58 +318,6 @@ xfs_inode_to_disk(
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-void
|
||
|
|
-xfs_log_dinode_to_disk(
|
||
|
|
- struct xfs_log_dinode *from,
|
||
|
|
- struct xfs_dinode *to)
|
||
|
|
-{
|
||
|
|
- to->di_magic = cpu_to_be16(from->di_magic);
|
||
|
|
- to->di_mode = cpu_to_be16(from->di_mode);
|
||
|
|
- to->di_version = from->di_version;
|
||
|
|
- to->di_format = from->di_format;
|
||
|
|
- to->di_onlink = 0;
|
||
|
|
- to->di_uid = cpu_to_be32(from->di_uid);
|
||
|
|
- to->di_gid = cpu_to_be32(from->di_gid);
|
||
|
|
- to->di_nlink = cpu_to_be32(from->di_nlink);
|
||
|
|
- to->di_projid_lo = cpu_to_be16(from->di_projid_lo);
|
||
|
|
- to->di_projid_hi = cpu_to_be16(from->di_projid_hi);
|
||
|
|
- memcpy(to->di_pad, from->di_pad, sizeof(to->di_pad));
|
||
|
|
-
|
||
|
|
- to->di_atime.t_sec = cpu_to_be32(from->di_atime.t_sec);
|
||
|
|
- to->di_atime.t_nsec = cpu_to_be32(from->di_atime.t_nsec);
|
||
|
|
- to->di_mtime.t_sec = cpu_to_be32(from->di_mtime.t_sec);
|
||
|
|
- to->di_mtime.t_nsec = cpu_to_be32(from->di_mtime.t_nsec);
|
||
|
|
- to->di_ctime.t_sec = cpu_to_be32(from->di_ctime.t_sec);
|
||
|
|
- to->di_ctime.t_nsec = cpu_to_be32(from->di_ctime.t_nsec);
|
||
|
|
-
|
||
|
|
- to->di_size = cpu_to_be64(from->di_size);
|
||
|
|
- to->di_nblocks = cpu_to_be64(from->di_nblocks);
|
||
|
|
- to->di_extsize = cpu_to_be32(from->di_extsize);
|
||
|
|
- to->di_nextents = cpu_to_be32(from->di_nextents);
|
||
|
|
- to->di_anextents = cpu_to_be16(from->di_anextents);
|
||
|
|
- to->di_forkoff = from->di_forkoff;
|
||
|
|
- to->di_aformat = from->di_aformat;
|
||
|
|
- to->di_dmevmask = cpu_to_be32(from->di_dmevmask);
|
||
|
|
- to->di_dmstate = cpu_to_be16(from->di_dmstate);
|
||
|
|
- to->di_flags = cpu_to_be16(from->di_flags);
|
||
|
|
- to->di_gen = cpu_to_be32(from->di_gen);
|
||
|
|
-
|
||
|
|
- if (from->di_version == 3) {
|
||
|
|
- to->di_changecount = cpu_to_be64(from->di_changecount);
|
||
|
|
- to->di_crtime.t_sec = cpu_to_be32(from->di_crtime.t_sec);
|
||
|
|
- to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.t_nsec);
|
||
|
|
- to->di_flags2 = cpu_to_be64(from->di_flags2);
|
||
|
|
- to->di_cowextsize = cpu_to_be32(from->di_cowextsize);
|
||
|
|
- to->di_ino = cpu_to_be64(from->di_ino);
|
||
|
|
- to->di_lsn = cpu_to_be64(from->di_lsn);
|
||
|
|
- memcpy(to->di_pad2, from->di_pad2, sizeof(to->di_pad2));
|
||
|
|
- uuid_copy(&to->di_uuid, &from->di_uuid);
|
||
|
|
- to->di_flushiter = 0;
|
||
|
|
- } else {
|
||
|
|
- to->di_flushiter = cpu_to_be16(from->di_flushiter);
|
||
|
|
- }
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static xfs_failaddr_t
|
||
|
|
xfs_dinode_verify_fork(
|
||
|
|
struct xfs_dinode *dip,
|
||
|
|
diff --git a/libxfs/xfs_inode_buf.h b/libxfs/xfs_inode_buf.h
|
||
|
|
index c9ac69c..0343368 100644
|
||
|
|
--- a/libxfs/xfs_inode_buf.h
|
||
|
|
+++ b/libxfs/xfs_inode_buf.h
|
||
|
|
@@ -59,8 +59,6 @@ void xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *);
|
||
|
|
void xfs_inode_to_disk(struct xfs_inode *ip, struct xfs_dinode *to,
|
||
|
|
xfs_lsn_t lsn);
|
||
|
|
void xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from);
|
||
|
|
-void xfs_log_dinode_to_disk(struct xfs_log_dinode *from,
|
||
|
|
- struct xfs_dinode *to);
|
||
|
|
|
||
|
|
bool xfs_dinode_good_version(struct xfs_mount *mp, __u8 version);
|
||
|
|
|