Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46e5d0a3 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ovl: copy up file size as well 



Copy i_size of the underlying inode to the overlay inode in ovl_copyattr().

This is in preparation for stacking I/O operations on overlay files.

This patch shouldn't have any observable effect.

Remove stale comment from ovl_setattr() [spotted by Vivek Goyal].

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

fs/overlayfs/inode.c

+0 −9
Original line number Diff line number Diff line
@@ -22,15 +22,6 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr) 
	struct dentry *upperdentry;

	const struct cred *old_cred;



	/*

	 * Check for permissions before trying to copy-up.  This is redundant

	 * since it will be rechecked later by ->setattr() on upper dentry.  But

	 * without this, copy-up can be triggered by just about anybody.

	 *

	 * We don't initialize inode->size, which just means that

	 * inode_newsize_ok() will always check against MAX_LFS_FILESIZE and not

	 * check for a swapfile (which this won't be anyway).

	 */

	err = setattr_prepare(dentry, attr);

	if (err)

		return err;

fs/overlayfs/overlayfs.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/kernel.h>

#include <linux/uuid.h>

#include <linux/fs.h>

#include "ovl_entry.h"



enum ovl_path_type {
@@ -348,6 +349,7 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to) 
	to->i_atime = from->i_atime;

	to->i_mtime = from->i_mtime;

	to->i_ctime = from->i_ctime;

	i_size_write(to, i_size_read(from));

}



static inline void ovl_copyflags(struct inode *from, struct inode *to)