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

Commit 2a610b8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull VFS fixes from Al Viro:
 "statx followup fixes and a fix for stack-smashing on alpha"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  alpha: fix stack smashing in old_adjtimex(2)
  statx: Include a mask for stx_attributes in struct statx
  statx: Reserve the top bit of the mask for future struct expansion
  xfs: report crtime and attribute flags to statx
  ext4: Add statx support
  statx: optimize copy of struct statx to userspace
  statx: remove incorrect part of vfs_statx() comment
  statx: reject unknown flags when using NULL path
  Documentation/filesystems: fix documentation for ->getattr()
parents 78d91a75 a8e28440

Documentation/filesystems/Locking

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ prototypes: 
	int (*permission) (struct inode *, int, unsigned int);

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

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

	int (*getattr) (const struct path *, struct dentry *, struct kstat *,

			u32, unsigned int);

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

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

	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);

	void (*update_time)(struct inode *, struct timespec *, int);

Documentation/filesystems/porting

+6 −0
Original line number Diff line number Diff line
@@ -600,3 +600,9 @@ in your dentry operations instead. 
[recommended]

	->readlink is optional for symlinks.  Don't set, unless filesystem needs

	to fake something for readlink(2).

--

[mandatory]

	->getattr() is now passed a struct path rather than a vfsmount and

	dentry separately, and it now has request_mask and query_flags arguments

	to specify the fields and sync type requested by statx.  Filesystems not

	supporting any statx-specific features may ignore the new arguments.

Documentation/filesystems/vfs.txt

+1 −2
Original line number Diff line number Diff line
@@ -382,8 +382,7 @@ struct inode_operations { 
	int (*permission) (struct inode *, int);

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

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

	int (*getattr) (const struct path *, struct dentry *, struct kstat *,

			u32, unsigned int);

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

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

	void (*update_time)(struct inode *, struct timespec *, int);

	int (*atomic_open)(struct inode *, struct dentry *, struct file *,

arch/alpha/kernel/osf_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) 
	/* copy relevant bits of struct timex. */

	if (copy_from_user(&txc, txc_p, offsetof(struct timex32, time)) ||

	    copy_from_user(&txc.tick, &txc_p->tick, sizeof(struct timex32) - 

			   offsetof(struct timex32, time)))

			   offsetof(struct timex32, tick)))

	  return -EFAULT;



	ret = do_adjtimex(&txc);

fs/ext4/ext4.h

+1 −0
Original line number Diff line number Diff line
@@ -2466,6 +2466,7 @@ extern int ext4_setattr(struct dentry *, struct iattr *); 
extern int  ext4_getattr(const struct path *, struct kstat *, u32, unsigned int);

extern void ext4_evict_inode(struct inode *);

extern void ext4_clear_inode(struct inode *);

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

extern int  ext4_sync_inode(handle_t *, struct inode *);

extern void ext4_dirty_inode(struct inode *, int);

extern int ext4_change_inode_journal_flag(struct inode *, int);