From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
David Chinner <david@fromorbit.com>,
xfs-masters@oss.sgi.com
Subject: linux-next: manual merge of the vfs tree with the xfs tree
Date: Mon, 5 Jul 2010 10:02:48 +1000 [thread overview]
Message-ID: <20100705100248.173ec8ee.sfr@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/xfs/linux-2.6/xfs_super.c between commit
04d2da9c682ce2687db29136c60d8679e37e3b35 ("xfs: split xfs_itrace_entry")
from the xfs tree and commit b43cb885cc49c782dd0734292d3cd95631200e5c
("convert remaining ->clear_inode() to ->evict_inode()") from the vfs
tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary. I guess that the tracing code needs updating for the
xfs_fs_clear_inode -> xfs_fs_evict_inode name change as well. And I am
wondering if the tracing wants to go ahead of the truncate_inode_pages()
call?
In anticipation, I have added this merge fix patch as well:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Jul 2010 09:43:42 +1000
Subject: [PATCH] xfs: update tracing for clear_inode to evit_inode transition
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/xfs/linux-2.6/xfs_super.c | 4 ++--
fs/xfs/linux-2.6/xfs_trace.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 157aaed..3e5052c 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1107,10 +1107,10 @@ xfs_fs_evict_inode(
{
xfs_inode_t *ip = XFS_I(inode);
+ trace_xfs_evict_inode(ip);
+
truncate_inode_pages(&inode->i_data, 0);
end_writeback(inode);
- trace_xfs_clear_inode(ip);
-
XFS_STATS_INC(vn_rele);
XFS_STATS_INC(vn_remove);
XFS_STATS_DEC(vn_active);
diff --git a/fs/xfs/linux-2.6/xfs_trace.h b/fs/xfs/linux-2.6/xfs_trace.h
index d506753..76de133 100644
--- a/fs/xfs/linux-2.6/xfs_trace.h
+++ b/fs/xfs/linux-2.6/xfs_trace.h
@@ -576,7 +576,7 @@ DEFINE_INODE_EVENT(xfs_ioctl_setattr);
DEFINE_INODE_EVENT(xfs_file_fsync);
DEFINE_INODE_EVENT(xfs_destroy_inode);
DEFINE_INODE_EVENT(xfs_write_inode);
-DEFINE_INODE_EVENT(xfs_clear_inode);
+DEFINE_INODE_EVENT(xfs_evict_inode);
DEFINE_INODE_EVENT(xfs_dquot_dqalloc);
DEFINE_INODE_EVENT(xfs_dquot_dqdetach);
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/xfs/linux-2.6/xfs_super.c
index e3de46c,1dc602f..0000000
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@@ -1107,8 -1156,9 +1107,10 @@@ xfs_fs_evict_inode
{
xfs_inode_t *ip = XFS_I(inode);
+ truncate_inode_pages(&inode->i_data, 0);
+ end_writeback(inode);
- xfs_itrace_entry(ip);
+ trace_xfs_clear_inode(ip);
+
XFS_STATS_INC(vn_rele);
XFS_STATS_INC(vn_remove);
XFS_STATS_DEC(vn_active);
next reply other threads:[~2010-07-05 0:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-05 0:02 Stephen Rothwell [this message]
2010-07-07 1:48 ` linux-next: manual merge of the vfs tree with the xfs tree Christoph Hellwig
2010-07-07 3:50 ` Stephen Rothwell
2010-08-04 1:54 ` Stephen Rothwell
2010-07-26 1:51 Stephen Rothwell
2010-07-26 3:59 ` Dave Chinner
2010-07-26 4:05 ` Stephen Rothwell
2011-07-18 3:36 Stephen Rothwell
2011-07-19 1:29 ` Dave Chinner
2015-04-13 1:57 Stephen Rothwell
2015-04-13 2:12 ` Dave Chinner
2015-04-14 1:34 Stephen Rothwell
2015-11-10 23:21 Stephen Rothwell
2016-12-11 23:19 Stephen Rothwell
2018-10-31 0:52 Stephen Rothwell
2018-10-31 1:12 ` Dave Chinner
2021-04-12 2:22 Stephen Rothwell
2021-04-13 15:20 ` Darrick J. Wong
2021-04-19 0:49 Stephen Rothwell
2021-04-20 16:40 ` Darrick J. Wong
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=20100705100248.173ec8ee.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
--cc=xfs-masters@oss.sgi.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).