From: Deepa Dinamani <deepa.kernel@gmail.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
y2038 Mailman List <y2038@lists.linaro.org>,
Linux FS-devel Mailing List <linux-fsdevel@vger.kernel.org>,
"Dilger, Andreas" <andreas.dilger@intel.com>,
anton@tuxera.com, Felipe Balbi <balbi@kernel.org>,
"J. Bruce Fields" <bfields@fieldses.org>,
ceph-devel <ceph-devel@vger.kernel.org>,
"Darrick J. Wong" <darrick.wong@oracle.com>,
David Howells <dhowells@redhat.com>,
David Sterba <dsterba@suse.com>,
David Woodhouse <dwmw2@infradead.org>,
Christoph Hellwig <hch@lst.de>,
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>,
Mike Marshall <hubcap@omnibond.com>, Jan Kara <jack@suse.com>,
Jaegeuk Kim <jaegeuk@kernel.org>,
Jan Harkes <jaharkes@cs.cmu.edu>, Jiri Slaby <jslaby@suse.com>,
Kees Cook <keescook@chromium.org>, Mark Fasheh <mark@fasheh.com>,
Miklos Szeredi <miklos@szeredi.hu>,
Nicolas Pitre <nico@linaro.org>,
reiserfs-devel@vger.kernel.org,
Richard Weinberger <richard@nod.at>, Sage Weil <sage@redhat.com>,
Steve French <sfrench@samba.org>,
Steven Whitehouse <swhiteho@redhat.com>,
Tejun Heo <tj@kernel.org>,
Trond Myklebust <trond.myklebust@primarydata.com>,
"Theodore Ts'o" <tytso@mit.edu>, "Yan, Zheng" <zyan@redhat.com>,
Miklos Szeredi <mszeredi@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] Transition vfs to 64-bit timestamps
Date: Fri, 1 Jun 2018 13:58:10 -0700 [thread overview]
Message-ID: <CABeXuvpCY1xWYzoTXQZyXk7c1SaEbf+2i4q+C2uc0WvMuk-sAA@mail.gmail.com> (raw)
In-Reply-To: <CAK8P3a1_qJRALkxxb1uPnEaf8T5LsL0N1LbDUqxOr4SUDhPk1g@mail.gmail.com>
There will be more conflicts if the lustre deletion patch gets into linux-next.
Regenerating the pull request close to when someone is ready to take
it would be the best scenario.
Are there any other suggestions as to how to merge a flag day patch like this?
Thanks,
-Deepa
On Wed, May 30, 2018 at 8:16 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Sat, May 26, 2018 at 1:35 AM, Deepa Dinamani <deepa.kernel@gmail.com> wrote:
>
>> The flag patch applies cleanly. I've not seen the timestamps
>> update logic change often. The series applies cleanly on 4.17-rc6
>> and linux-next tip (top commit: next-20180517).
>
> It just stopped applying cleanly against the latest linux-next tree, due to
> a conflict against two patches from the overlayfs-next tree:
>
> b2a285e1dc5d ("Revert "vfs: update ovl inode before relatime check"")
> 681b186a012d ("Revert "ovl: fix relatime for directories"")
>
> After the conflict resolution below, it works fine again. Not sure what the
> best merge strategy would be, at least the bit in ovl_file_accessed()
> isn't obvious enough.
>
> Arnd
>
> diff --cc fs/inode.c
> index 6404639e2491,9fe1f941be02..195b974e7a77
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@@ -1635,10 -1681,11 +1635,10 @@@ static int update_time(struct inode *in
> * This function automatically handles read only file systems and media,
> * as well as the "noatime" flag and inode specific "noatime" markers.
> */
> -bool __atime_needs_update(const struct path *path, struct inode *inode,
> - bool rcu)
> +bool atime_needs_update(const struct path *path, struct inode *inode)
> {
> struct vfsmount *mnt = path->mnt;
> - struct timespec now;
> + struct timespec64 now;
>
> if (inode->i_flags & S_NOATIME)
> return false;
> @@@ -1661,10 -1708,10 +1661,14 @@@
>
> now = current_time(inode);
>
> - if (!relatime_need_update(mnt, inode, now))
> - if (!relatime_need_update(path, inode,
> timespec64_to_timespec(now), rcu))
> ++ if (!relatime_need_update(mnt, inode, timespec64_to_timespec(now)))
> return false;
>
> - if (timespec_equal(&inode->i_atime, &now))
> + if (timespec64_equal(&inode->i_atime, &now))
> return false;
>
> return true;
> @@@ -1674,9 -1721,9 +1678,9 @@@ void touch_atime(const struct path *pat
> {
> struct vfsmount *mnt = path->mnt;
> struct inode *inode = d_inode(path->dentry);
> - struct timespec now;
> + struct timespec64 now;
>
> - if (!__atime_needs_update(path, inode, false))
> + if (!atime_needs_update(path, inode))
> return;
>
> if (!sb_start_write_trylock(inode->i_sb))
> diff --cc fs/overlayfs/inode.c
> index e31d64206a01,d7cca60f28e6..e0bb217c01e2
> --- a/fs/overlayfs/inode.c
> +++ b/fs/overlayfs/inode.c
> @@ -169,8 +169,8 @@ static void ovl_file_accessed(struct file *file)
> if (!upperinode)
> return;
>
> - if ((!timespec_equal(&inode->i_mtime, &upperinode->i_mtime) ||
> - !timespec_equal(&inode->i_ctime, &upperinode->i_ctime))) {
> + if ((!timespec64_equal(&inode->i_mtime, &upperinode->i_mtime) ||
> + !timespec64_equal(&inode->i_ctime, &upperinode->i_ctime))) {
> inode->i_mtime = upperinode->i_mtime;
> inode->i_ctime = upperinode->i_ctime;
> }
> @@@ -439,7 -384,39 +439,7 @@@ struct posix_acl *ovl_get_acl(struct in
> return acl;
> }
>
> - int ovl_update_time(struct inode *inode, struct timespec *ts, int flags)
> -static bool ovl_open_need_copy_up(struct dentry *dentry, int flags)
> -{
> - /* Copy up of disconnected dentry does not set upper alias */
> - if (ovl_dentry_upper(dentry) &&
> - (ovl_dentry_has_upper_alias(dentry) ||
> - (dentry->d_flags & DCACHE_DISCONNECTED)))
> - return false;
> -
> - if (special_file(d_inode(dentry)->i_mode))
> - return false;
> -
> - if (!(OPEN_FMODE(flags) & FMODE_WRITE) && !(flags & O_TRUNC))
> - return false;
> -
> - return true;
> -}
> -
> -int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags)
> -{
> - int err = 0;
> -
> - if (ovl_open_need_copy_up(dentry, file_flags)) {
> - err = ovl_want_write(dentry);
> - if (!err) {
> - err = ovl_copy_up_flags(dentry, file_flags);
> - ovl_drop_write(dentry);
> - }
> - }
> -
> - return err;
> -}
> -
> + int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags)
> {
> if (flags & S_ATIME) {
> struct ovl_fs *ofs = inode->i_sb->s_fs_info;
> diff --cc fs/overlayfs/overlayfs.h
> index 93c84929d422,9fe10247f9d4..8477d9e4b4fe
> --- a/fs/overlayfs/overlayfs.h
> +++ b/fs/overlayfs/overlayfs.h
> @@@ -356,18 -330,10 +356,18 @@@ int ovl_xattr_get(struct dentry *dentry
> void *value, size_t size);
> ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
> struct posix_acl *ovl_get_acl(struct inode *inode, int type);
> - int ovl_update_time(struct inode *inode, struct timespec *ts, int flags);
> -int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags);
> + int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags);
> bool ovl_is_private_xattr(const char *name);
prev parent reply other threads:[~2018-06-01 20:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-25 23:35 [GIT PULL] Transition vfs to 64-bit timestamps Deepa Dinamani
2018-05-30 15:16 ` Arnd Bergmann
2018-06-01 20:58 ` Deepa Dinamani [this message]
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=CABeXuvpCY1xWYzoTXQZyXk7c1SaEbf+2i4q+C2uc0WvMuk-sAA@mail.gmail.com \
--to=deepa.kernel@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andreas.dilger@intel.com \
--cc=anton@tuxera.com \
--cc=arnd@arndb.de \
--cc=balbi@kernel.org \
--cc=bfields@fieldses.org \
--cc=ceph-devel@vger.kernel.org \
--cc=darrick.wong@oracle.com \
--cc=dhowells@redhat.com \
--cc=dsterba@suse.com \
--cc=dwmw2@infradead.org \
--cc=hch@lst.de \
--cc=hirofumi@mail.parknet.co.jp \
--cc=hubcap@omnibond.com \
--cc=jack@suse.com \
--cc=jaegeuk@kernel.org \
--cc=jaharkes@cs.cmu.edu \
--cc=jslaby@suse.com \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=miklos@szeredi.hu \
--cc=mszeredi@redhat.com \
--cc=nico@linaro.org \
--cc=reiserfs-devel@vger.kernel.org \
--cc=richard@nod.at \
--cc=sage@redhat.com \
--cc=sfrench@samba.org \
--cc=swhiteho@redhat.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=trond.myklebust@primarydata.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=y2038@lists.linaro.org \
--cc=zyan@redhat.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).