From: Deepa Dinamani <deepa.kernel@gmail.com>
To: viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, arnd@arndb.de
Subject: [PATCH v2 6/6] fs: Do not overload update_time
Date: Mon, 2 Dec 2019 21:19:45 -0800 [thread overview]
Message-ID: <20191203051945.9440-7-deepa.kernel@gmail.com> (raw)
In-Reply-To: <20191203051945.9440-1-deepa.kernel@gmail.com>
update_time() also has an internal function pointer
update_time. Even though this works correctly, it is
confusing to the readers.
Just use a regular if statement to call the generic
function or the function pointer.
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
---
fs/inode.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/inode.c b/fs/inode.c
index 12c9e38529c9..aff2b5831168 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1675,12 +1675,9 @@ EXPORT_SYMBOL(generic_update_time);
*/
static int update_time(struct inode *inode, struct timespec64 *time, int flags)
{
- int (*update_time)(struct inode *, struct timespec64 *, int);
-
- update_time = inode->i_op->update_time ? inode->i_op->update_time :
- generic_update_time;
-
- return update_time(inode, time, flags);
+ if (inode->i_op->update_time)
+ return inode->i_op->update_time(inode, time, flags);
+ return generic_update_time(inode, time, flags);
}
/**
--
2.17.1
next prev parent reply other threads:[~2019-12-03 5:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 5:19 [PATCH v2 0/6] Delete timespec64_trunc() Deepa Dinamani
2019-12-03 5:19 ` [PATCH v2 1/6] fs: fat: Eliminate timespec64_trunc() usage Deepa Dinamani
2019-12-03 5:19 ` [PATCH v2 2/6] fs: cifs: Delete usage of timespec64_trunc Deepa Dinamani
2019-12-03 5:19 ` [PATCH v2 3/6] fs: ceph: Delete timespec64_trunc() usage Deepa Dinamani
2019-12-03 18:55 ` Jeff Layton
2019-12-03 19:41 ` Deepa Dinamani
2019-12-03 19:49 ` Jeff Layton
2019-12-03 5:19 ` [PATCH v2 4/6] fs: ubifs: Eliminate " Deepa Dinamani
2019-12-03 5:19 ` [PATCH v2 5/6] fs: Delete timespec64_trunc() Deepa Dinamani
2019-12-03 5:19 ` Deepa Dinamani [this message]
2019-12-06 2:43 ` [PATCH v2 0/6] " Deepa Dinamani
2019-12-07 6:02 ` Al Viro
2019-12-08 2:04 ` Deepa Dinamani
2019-12-08 3:04 ` Al Viro
2019-12-09 0:48 ` Al Viro
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=20191203051945.9440-7-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=arnd@arndb.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).