From: Steven Whitehouse <swhiteho@redhat.com> To: linux-kernel@vger.kernel.org, cluster-devel@redhat.com Cc: Steven Whitehouse <swhiteho@redhat.com> Subject: [PATCH 26/32] GFS2: Move final part of inode.c into super.c Date: Thu, 19 May 2011 09:47:21 +0100 [thread overview] Message-ID: <1305794847-3291-27-git-send-email-swhiteho@redhat.com> (raw) In-Reply-To: <1305794847-3291-1-git-send-email-swhiteho@redhat.com> Now inode.c is empty. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index b95ee5d..9076fbe 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -36,39 +36,3 @@ #include "util.h" -void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) -{ - struct gfs2_dinode *str = buf; - - str->di_header.mh_magic = cpu_to_be32(GFS2_MAGIC); - str->di_header.mh_type = cpu_to_be32(GFS2_METATYPE_DI); - str->di_header.mh_format = cpu_to_be32(GFS2_FORMAT_DI); - str->di_num.no_addr = cpu_to_be64(ip->i_no_addr); - str->di_num.no_formal_ino = cpu_to_be64(ip->i_no_formal_ino); - str->di_mode = cpu_to_be32(ip->i_inode.i_mode); - str->di_uid = cpu_to_be32(ip->i_inode.i_uid); - str->di_gid = cpu_to_be32(ip->i_inode.i_gid); - str->di_nlink = cpu_to_be32(ip->i_inode.i_nlink); - str->di_size = cpu_to_be64(i_size_read(&ip->i_inode)); - str->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(&ip->i_inode)); - str->di_atime = cpu_to_be64(ip->i_inode.i_atime.tv_sec); - str->di_mtime = cpu_to_be64(ip->i_inode.i_mtime.tv_sec); - str->di_ctime = cpu_to_be64(ip->i_inode.i_ctime.tv_sec); - - str->di_goal_meta = cpu_to_be64(ip->i_goal); - str->di_goal_data = cpu_to_be64(ip->i_goal); - str->di_generation = cpu_to_be64(ip->i_generation); - - str->di_flags = cpu_to_be32(ip->i_diskflags); - str->di_height = cpu_to_be16(ip->i_height); - str->di_payload_format = cpu_to_be32(S_ISDIR(ip->i_inode.i_mode) && - !(ip->i_diskflags & GFS2_DIF_EXHASH) ? - GFS2_FORMAT_DE : 0); - str->di_depth = cpu_to_be16(ip->i_depth); - str->di_entries = cpu_to_be32(ip->i_entries); - - str->di_eattr = cpu_to_be64(ip->i_eattr); - str->di_atime_nsec = cpu_to_be32(ip->i_inode.i_atime.tv_nsec); - str->di_mtime_nsec = cpu_to_be32(ip->i_inode.i_mtime.tv_nsec); - str->di_ctime_nsec = cpu_to_be32(ip->i_inode.i_ctime.tv_nsec); -} diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 3061ac6..ed540e7 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -701,6 +701,42 @@ void gfs2_unfreeze_fs(struct gfs2_sbd *sdp) mutex_unlock(&sdp->sd_freeze_lock); } +void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) +{ + struct gfs2_dinode *str = buf; + + str->di_header.mh_magic = cpu_to_be32(GFS2_MAGIC); + str->di_header.mh_type = cpu_to_be32(GFS2_METATYPE_DI); + str->di_header.mh_format = cpu_to_be32(GFS2_FORMAT_DI); + str->di_num.no_addr = cpu_to_be64(ip->i_no_addr); + str->di_num.no_formal_ino = cpu_to_be64(ip->i_no_formal_ino); + str->di_mode = cpu_to_be32(ip->i_inode.i_mode); + str->di_uid = cpu_to_be32(ip->i_inode.i_uid); + str->di_gid = cpu_to_be32(ip->i_inode.i_gid); + str->di_nlink = cpu_to_be32(ip->i_inode.i_nlink); + str->di_size = cpu_to_be64(i_size_read(&ip->i_inode)); + str->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(&ip->i_inode)); + str->di_atime = cpu_to_be64(ip->i_inode.i_atime.tv_sec); + str->di_mtime = cpu_to_be64(ip->i_inode.i_mtime.tv_sec); + str->di_ctime = cpu_to_be64(ip->i_inode.i_ctime.tv_sec); + + str->di_goal_meta = cpu_to_be64(ip->i_goal); + str->di_goal_data = cpu_to_be64(ip->i_goal); + str->di_generation = cpu_to_be64(ip->i_generation); + + str->di_flags = cpu_to_be32(ip->i_diskflags); + str->di_height = cpu_to_be16(ip->i_height); + str->di_payload_format = cpu_to_be32(S_ISDIR(ip->i_inode.i_mode) && + !(ip->i_diskflags & GFS2_DIF_EXHASH) ? + GFS2_FORMAT_DE : 0); + str->di_depth = cpu_to_be16(ip->i_depth); + str->di_entries = cpu_to_be32(ip->i_entries); + + str->di_eattr = cpu_to_be64(ip->i_eattr); + str->di_atime_nsec = cpu_to_be32(ip->i_inode.i_atime.tv_nsec); + str->di_mtime_nsec = cpu_to_be32(ip->i_inode.i_mtime.tv_nsec); + str->di_ctime_nsec = cpu_to_be32(ip->i_inode.i_ctime.tv_nsec); +} /** * gfs2_write_inode - Make sure the inode is stable on the disk -- 1.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Steven Whitehouse <swhiteho@redhat.com> To: cluster-devel.redhat.com Subject: [Cluster-devel] [PATCH 26/32] GFS2: Move final part of inode.c into super.c Date: Thu, 19 May 2011 09:47:21 +0100 [thread overview] Message-ID: <1305794847-3291-27-git-send-email-swhiteho@redhat.com> (raw) In-Reply-To: <1305794847-3291-1-git-send-email-swhiteho@redhat.com> Now inode.c is empty. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index b95ee5d..9076fbe 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -36,39 +36,3 @@ #include "util.h" -void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) -{ - struct gfs2_dinode *str = buf; - - str->di_header.mh_magic = cpu_to_be32(GFS2_MAGIC); - str->di_header.mh_type = cpu_to_be32(GFS2_METATYPE_DI); - str->di_header.mh_format = cpu_to_be32(GFS2_FORMAT_DI); - str->di_num.no_addr = cpu_to_be64(ip->i_no_addr); - str->di_num.no_formal_ino = cpu_to_be64(ip->i_no_formal_ino); - str->di_mode = cpu_to_be32(ip->i_inode.i_mode); - str->di_uid = cpu_to_be32(ip->i_inode.i_uid); - str->di_gid = cpu_to_be32(ip->i_inode.i_gid); - str->di_nlink = cpu_to_be32(ip->i_inode.i_nlink); - str->di_size = cpu_to_be64(i_size_read(&ip->i_inode)); - str->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(&ip->i_inode)); - str->di_atime = cpu_to_be64(ip->i_inode.i_atime.tv_sec); - str->di_mtime = cpu_to_be64(ip->i_inode.i_mtime.tv_sec); - str->di_ctime = cpu_to_be64(ip->i_inode.i_ctime.tv_sec); - - str->di_goal_meta = cpu_to_be64(ip->i_goal); - str->di_goal_data = cpu_to_be64(ip->i_goal); - str->di_generation = cpu_to_be64(ip->i_generation); - - str->di_flags = cpu_to_be32(ip->i_diskflags); - str->di_height = cpu_to_be16(ip->i_height); - str->di_payload_format = cpu_to_be32(S_ISDIR(ip->i_inode.i_mode) && - !(ip->i_diskflags & GFS2_DIF_EXHASH) ? - GFS2_FORMAT_DE : 0); - str->di_depth = cpu_to_be16(ip->i_depth); - str->di_entries = cpu_to_be32(ip->i_entries); - - str->di_eattr = cpu_to_be64(ip->i_eattr); - str->di_atime_nsec = cpu_to_be32(ip->i_inode.i_atime.tv_nsec); - str->di_mtime_nsec = cpu_to_be32(ip->i_inode.i_mtime.tv_nsec); - str->di_ctime_nsec = cpu_to_be32(ip->i_inode.i_ctime.tv_nsec); -} diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 3061ac6..ed540e7 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -701,6 +701,42 @@ void gfs2_unfreeze_fs(struct gfs2_sbd *sdp) mutex_unlock(&sdp->sd_freeze_lock); } +void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) +{ + struct gfs2_dinode *str = buf; + + str->di_header.mh_magic = cpu_to_be32(GFS2_MAGIC); + str->di_header.mh_type = cpu_to_be32(GFS2_METATYPE_DI); + str->di_header.mh_format = cpu_to_be32(GFS2_FORMAT_DI); + str->di_num.no_addr = cpu_to_be64(ip->i_no_addr); + str->di_num.no_formal_ino = cpu_to_be64(ip->i_no_formal_ino); + str->di_mode = cpu_to_be32(ip->i_inode.i_mode); + str->di_uid = cpu_to_be32(ip->i_inode.i_uid); + str->di_gid = cpu_to_be32(ip->i_inode.i_gid); + str->di_nlink = cpu_to_be32(ip->i_inode.i_nlink); + str->di_size = cpu_to_be64(i_size_read(&ip->i_inode)); + str->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(&ip->i_inode)); + str->di_atime = cpu_to_be64(ip->i_inode.i_atime.tv_sec); + str->di_mtime = cpu_to_be64(ip->i_inode.i_mtime.tv_sec); + str->di_ctime = cpu_to_be64(ip->i_inode.i_ctime.tv_sec); + + str->di_goal_meta = cpu_to_be64(ip->i_goal); + str->di_goal_data = cpu_to_be64(ip->i_goal); + str->di_generation = cpu_to_be64(ip->i_generation); + + str->di_flags = cpu_to_be32(ip->i_diskflags); + str->di_height = cpu_to_be16(ip->i_height); + str->di_payload_format = cpu_to_be32(S_ISDIR(ip->i_inode.i_mode) && + !(ip->i_diskflags & GFS2_DIF_EXHASH) ? + GFS2_FORMAT_DE : 0); + str->di_depth = cpu_to_be16(ip->i_depth); + str->di_entries = cpu_to_be32(ip->i_entries); + + str->di_eattr = cpu_to_be64(ip->i_eattr); + str->di_atime_nsec = cpu_to_be32(ip->i_inode.i_atime.tv_nsec); + str->di_mtime_nsec = cpu_to_be32(ip->i_inode.i_mtime.tv_nsec); + str->di_ctime_nsec = cpu_to_be32(ip->i_inode.i_ctime.tv_nsec); +} /** * gfs2_write_inode - Make sure the inode is stable on the disk -- 1.7.4
next prev parent reply other threads:[~2011-05-19 9:10 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-05-19 8:46 GFS2: Pre-pull patch posting (merge window) Steven Whitehouse 2011-05-19 8:46 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:46 ` [PATCH 01/32] GFS2: Dump better debug info if a bitmap inconsistency is detected Steven Whitehouse 2011-05-19 8:46 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:46 ` [PATCH 02/32] GFS2: remove *leaf_call_t and simplify leaf_dealloc Steven Whitehouse 2011-05-19 8:46 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:46 ` [PATCH 03/32] GFS2: Combine transaction from gfs2_dir_exhash_dealloc Steven Whitehouse 2011-05-19 8:46 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:46 ` [PATCH 04/32] GFS2: pass leaf_bh into leaf_dealloc Steven Whitehouse 2011-05-19 8:46 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 05/32] GFS2: move function foreach_leaf to gfs2_dir_exhash_dealloc Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 06/32] GFS2: Make ->write_inode() really write Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 07/32] GFS2: Use filemap_fdatawrite() to write back the AIL Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 08/32] GFS2: Alter point of entry to glock lru list for glocks with an address_space Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 09/32] GFS2: Remove unused macro Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 10/32] GFS2: Clean up fsync() Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 11/32] GFS2: Improve tracing support (adds two flags) Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 12/32] GFS2: Optimise glock lru and end of life inodes Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 13/32] GFS2: Make writeback more responsive to system conditions Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 14/32] GFS2: Add an AIL writeback tracepoint Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 15/32] GFS2: make sure fallocate bytes is a multiple of blksize Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 16/32] GFS2: Fix ail list traversal Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 17/32] GFS2: Improve bug trap code in ->releasepage() Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 18/32] GFS2: Double check link count under glock Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 19/32] GFS2: Don't use a try lock when promoting to a higher mode Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 20/32] GFS2: Don't use gfs2_change_nlink in link syscall Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 21/32] GFS2: Make gfs2_dir_del update link count when required Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 22/32] GFS2: When adding a new dir entry, inc link count if it is a subdir Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 23/32] GFS2: Remove gfs2_dinode_print() function Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 24/32] GFS2: Move gfs2_refresh_inode() and friends into glops.c Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 25/32] GFS2: Move most of the remaining inode.c into ops_inode.c Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` Steven Whitehouse [this message] 2011-05-19 8:47 ` [Cluster-devel] [PATCH 26/32] GFS2: Move final part of inode.c into super.c Steven Whitehouse 2011-05-19 8:47 ` [PATCH 27/32] GFS2: Inode.c is empty now, remove it Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 28/32] GFS2: Rename ops_inode.c to inode.c Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 29/32] GFS2: Use UUID field in generic superblock Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 30/32] GFS2: Clean up mkdir Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 31/32] GFS2: Clean up symlink creation Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse 2011-05-19 8:47 ` [PATCH 32/32] GFS2: Move all locking inside the inode creation function Steven Whitehouse 2011-05-19 8:47 ` [Cluster-devel] " Steven Whitehouse
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1305794847-3291-27-git-send-email-swhiteho@redhat.com \ --to=swhiteho@redhat.com \ --cc=cluster-devel@redhat.com \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.