Commit 815409a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ovl-update-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs 

Pull overlayfs update from Miklos Szeredi:

 - Copy up immutable/append/sync/noatime attributes (Amir Goldstein)

 - Improve performance by enabling RCU lookup.

 - Misc fixes and improvements

The reason this touches so many files is that the ->get_acl() method now
gets a "bool rcu" argument.  The ->get_acl() API was updated based on
comments from Al and Linus:

Link: https://lore.kernel.org/linux-fsdevel/CAJfpeguQxpd6Wgc0Jd3ks77zcsAv_bn0q17L3VNnnmPKu11t8A@mail.gmail.com/

* tag 'ovl-update-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: enable RCU'd ->get_acl()
  vfs: add rcu argument to ->get_acl() callback
  ovl: fix BUG_ON() in may_delete() when called from ovl_cleanup()
  ovl: use kvalloc in xattr copy-up
  ovl: update ctime when changing fileattr
  ovl: skip checking lower file's i_writecount on truncate
  ovl: relax lookup error on mismatch origin ftype
  ovl: do not set overlay.opaque for new directories
  ovl: add ovl_allow_offline_changes() helper
  ovl: disable decoding null uuid with redirect_dir
  ovl: consistent behavior for immutable/append-only inodes
  ovl: copy up sync/noatime fileattr flags
  ovl: pass ovl_fs to ovl_check_setxattr()
  fs: add generic helper for filling statx attribute flags
parents 412106c2 332f606b

Documentation/filesystems/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ prototypes:: 
	const char *(*get_link) (struct dentry *, struct inode *, struct delayed_call *);

	void (*truncate) (struct inode *);

	int (*permission) (struct inode *, int, unsigned int);

	int (*get_acl)(struct inode *, int);

	struct posix_acl * (*get_acl)(struct inode *, int, bool);

	int (*setattr) (struct dentry *, struct iattr *);

	int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);

	ssize_t (*listxattr) (struct dentry *, char *, size_t);

Documentation/filesystems/overlayfs.rst

+3 −0
Original line number Diff line number Diff line
@@ -427,6 +427,9 @@ b) If a file residing on a lower layer is opened for read-only and then 
memory mapped with MAP_SHARED, then subsequent changes to the file are not

reflected in the memory mapping.



c) If a file residing on a lower layer is being executed, then opening that

file for write or truncating the file will not be denied with ETXTBSY.



The following options allow overlayfs to act more like a standards

compliant filesystem:

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ As of kernel 2.6.22, the following members are defined: 
		const char *(*get_link) (struct dentry *, struct inode *,

					 struct delayed_call *);

		int (*permission) (struct user_namespace *, struct inode *, int);

		int (*get_acl)(struct inode *, int);

		struct posix_acl * (*get_acl)(struct inode *, int, bool);

		int (*setattr) (struct user_namespace *, struct dentry *, struct iattr *);

		int (*getattr) (struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int);

		ssize_t (*listxattr) (struct dentry *, char *, size_t);

fs/9p/acl.c

+4 −1
Original line number Diff line number Diff line
@@ -97,10 +97,13 @@ static struct posix_acl *v9fs_get_cached_acl(struct inode *inode, int type) 
	return acl;

}



struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type)

struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type, bool rcu)

{

	struct v9fs_session_info *v9ses;



	if (rcu)

		return ERR_PTR(-ECHILD);



	v9ses = v9fs_inode2v9ses(inode);

	if (((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) ||

			((v9ses->flags & V9FS_ACL_MASK) != V9FS_POSIX_ACL)) {

fs/9p/acl.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#ifdef CONFIG_9P_FS_POSIX_ACL

extern int v9fs_get_acl(struct inode *, struct p9_fid *);

extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type);

extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type, bool rcu);

extern int v9fs_acl_chmod(struct inode *, struct p9_fid *);

extern int v9fs_set_create_acl(struct inode *, struct p9_fid *,

			       struct posix_acl *, struct posix_acl *);