Commit b6650dab authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ovl: do not fail because of O_NOATIME 



In case the file cannot be opened with O_NOATIME because of lack of
capabilities, then clear O_NOATIME instead of failing.

Remove WARN_ON(), since it would now trigger if O_NOATIME was cleared.
Noticed by Amir Goldstein.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 6939f977

fs/overlayfs/file.c

+3 −8
Original line number Diff line number Diff line
@@ -53,9 +53,10 @@ static struct file *ovl_open_realfile(const struct file *file, 
	err = inode_permission(realinode, MAY_OPEN | acc_mode);

	if (err) {

		realfile = ERR_PTR(err);

	} else if (!inode_owner_or_capable(realinode)) {

		realfile = ERR_PTR(-EPERM);

	} else {

		if (!inode_owner_or_capable(realinode))

			flags &= ~O_NOATIME;



		realfile = open_with_fake_path(&file->f_path, flags, realinode,

					       current_cred());

	}
@@ -75,12 +76,6 @@ static int ovl_change_flags(struct file *file, unsigned int flags) 
	struct inode *inode = file_inode(file);

	int err;



	flags |= OVL_OPEN_FLAGS;



	/* If some flag changed that cannot be changed then something's amiss */

	if (WARN_ON((file->f_flags ^ flags) & ~OVL_SETFL_MASK))

		return -EIO;



	flags &= OVL_SETFL_MASK;



	if (((flags ^ file->f_flags) & O_APPEND) && IS_APPEND(inode))