From: Ivan Shapovalov <intelfx100@gmail.com>
To: reiserfs-devel@vger.kernel.org
Cc: Ivan Shapovalov <intelfx100@gmail.com>
Subject: [PATCHv2 2/3] Adjust reiser4 for 3.19: ->f_dentry is gone, convert remaining uses to an equivalent.
Date: Fri, 27 Feb 2015 02:16:49 +0300 [thread overview]
Message-ID: <1424992610-28927-2-git-send-email-intelfx100@gmail.com> (raw)
In-Reply-To: <1424992610-28927-1-git-send-email-intelfx100@gmail.com>
Upstream commit 78d28e651f97866d608d9b41f8ad291e65d47dd5
"kill f_dentry macro".
"f_dentry is gone; use f_path.dentry, or, better yet, see if you can
avoid it entirely."
Avoiding has been done in the previous commit. This commit blindly
replaces the remaining uses with an equivalent f_path.dentry.
Probably, these will need to be revisited someday...
Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
---
fs/reiser4/fsdata.c | 2 +-
fs/reiser4/plugin/dir_plugin_common.c | 2 +-
fs/reiser4/plugin/file/file.c | 2 +-
fs/reiser4/plugin/file/tail_conversion.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/reiser4/fsdata.c b/fs/reiser4/fsdata.c
index 7b77b7d..ad3f410 100644
--- a/fs/reiser4/fsdata.c
+++ b/fs/reiser4/fsdata.c
@@ -489,7 +489,7 @@ void reiser4_kill_cursors(struct inode *inode)
*/
static int file_is_stateless(struct file *file)
{
- return reiser4_get_dentry_fsdata(file->f_dentry)->stateless;
+ return reiser4_get_dentry_fsdata(file->f_path.dentry)->stateless;
}
/**
diff --git a/fs/reiser4/plugin/dir_plugin_common.c b/fs/reiser4/plugin/dir_plugin_common.c
index c65ee72..5e72fa6 100644
--- a/fs/reiser4/plugin/dir_plugin_common.c
+++ b/fs/reiser4/plugin/dir_plugin_common.c
@@ -96,7 +96,7 @@ int build_readdir_key_common(struct file *dir /* directory being read */ ,
assert("nikita-1361", dir != NULL);
assert("nikita-1362", result != NULL);
- assert("nikita-1363", dir->f_dentry != NULL);
+ assert("nikita-1363", dir->f_path.dentry != NULL);
inode = file_inode(dir);
assert("nikita-1373", inode != NULL);
diff --git a/fs/reiser4/plugin/file/file.c b/fs/reiser4/plugin/file/file.c
index 23a62b7..49c4c68 100644
--- a/fs/reiser4/plugin/file/file.c
+++ b/fs/reiser4/plugin/file/file.c
@@ -2317,7 +2317,7 @@ int release_unix_file(struct inode *inode, struct file *file)
uf_info = unix_file_inode_data(inode);
get_exclusive_access_careful(uf_info, inode);
- if (file->f_dentry->d_lockref.count == 1 &&
+ if (file->f_path.dentry->d_lockref.count == 1 &&
uf_info->container == UF_CONTAINER_EXTENTS &&
!should_have_notail(uf_info, inode->i_size) &&
!rofs_inode(inode)) {
diff --git a/fs/reiser4/plugin/file/tail_conversion.c b/fs/reiser4/plugin/file/tail_conversion.c
index ed9e4f8..196bff6 100644
--- a/fs/reiser4/plugin/file/tail_conversion.c
+++ b/fs/reiser4/plugin/file/tail_conversion.c
@@ -668,7 +668,7 @@ int extent2tail(struct file * file, struct unix_file_info *uf_info)
loff_t pos = start_byte;
assert("edward-1537",
- file != NULL && file->f_dentry != NULL);
+ file != NULL && file->f_path.dentry != NULL);
assert("edward-1538",
file_inode(file) == inode);
--
2.3.1
next prev parent reply other threads:[~2015-02-26 23:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-26 23:16 [PATCHv2 1/3] Adjust reiser4 for 3.19: ->f_dentry is gone, use file_inode() instead of ->f_dentry->d_inode Ivan Shapovalov
2015-02-26 23:16 ` Ivan Shapovalov [this message]
2015-02-26 23:16 ` [PATCHv2 3/3] Adjust reiser4 for 3.19: rip out all quota-related code Ivan Shapovalov
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=1424992610-28927-2-git-send-email-intelfx100@gmail.com \
--to=intelfx100@gmail.com \
--cc=reiserfs-devel@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: 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).