diff options
author | Deepa Dinamani <deepa.kernel@gmail.com> | 2016-09-14 10:48:06 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-27 21:06:22 -0400 |
commit | c2050a454c7f123d7a57fa1d76ff61bd43643abb (patch) | |
tree | 6f45ffffaf10f2534a38bfa28efb70ec24026a8d /fs/nfsd/blocklayout.c | |
parent | 02027d42c3f747945f19111d3da2092ed2148ac8 (diff) |
fs: Replace current_fs_time() with current_time()
current_fs_time() uses struct super_block* as an argument.
As per Linus's suggestion, this is changed to take struct
inode* as a parameter instead. This is because the function
is primarily meant for vfs inode timestamps.
Also the function was renamed as per Arnd's suggestion.
Change all calls to current_fs_time() to use the new
current_time() function instead. current_fs_time() will be
deleted.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfsd/blocklayout.c')
-rw-r--r-- | fs/nfsd/blocklayout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c index 5a1708441510..0780ff864539 100644 --- a/fs/nfsd/blocklayout.c +++ b/fs/nfsd/blocklayout.c | |||
@@ -123,7 +123,7 @@ nfsd4_block_commit_blocks(struct inode *inode, struct nfsd4_layoutcommit *lcp, | |||
123 | 123 | ||
124 | if (lcp->lc_mtime.tv_nsec == UTIME_NOW || | 124 | if (lcp->lc_mtime.tv_nsec == UTIME_NOW || |
125 | timespec_compare(&lcp->lc_mtime, &inode->i_mtime) < 0) | 125 | timespec_compare(&lcp->lc_mtime, &inode->i_mtime) < 0) |
126 | lcp->lc_mtime = current_fs_time(inode->i_sb); | 126 | lcp->lc_mtime = current_time(inode); |
127 | iattr.ia_valid |= ATTR_ATIME | ATTR_CTIME | ATTR_MTIME; | 127 | iattr.ia_valid |= ATTR_ATIME | ATTR_CTIME | ATTR_MTIME; |
128 | iattr.ia_atime = iattr.ia_ctime = iattr.ia_mtime = lcp->lc_mtime; | 128 | iattr.ia_atime = iattr.ia_ctime = iattr.ia_mtime = lcp->lc_mtime; |
129 | 129 | ||