Commit 63580e51 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 patches (part 1) from Al Viro:
 "The major change in this pile is ->readdir() replacement with
  ->iterate(), dealing with ->f_pos races in ->readdir() instances for
  good.

  There's a lot more, but I'd prefer to split the pull request into
  several stages and this is the first obvious cutoff point."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (67 commits)
  [readdir] constify ->actor
  [readdir] ->readdir() is gone
  [readdir] convert ecryptfs
  [readdir] convert coda
  [readdir] convert ocfs2
  [readdir] convert fatfs
  [readdir] convert xfs
  [readdir] convert btrfs
  [readdir] convert hostfs
  [readdir] convert afs
  [readdir] convert ncpfs
  [readdir] convert hfsplus
  [readdir] convert hfs
  [readdir] convert befs
  [readdir] convert cifs
  [readdir] convert freevxfs
  [readdir] convert fuse
  [readdir] convert hpfs
  reiserfs: switch reiserfs_readdir_dentry to inode
  reiserfs: is_privroot_deh() needs only directory inode, actually
  ...
parents 7747bd4b ac6614b7

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ prototypes: 
	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);

	ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);

	ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);

	int (*readdir) (struct file *, void *, filldir_t);

	int (*iterate) (struct file *, struct dir_context *);

	unsigned int (*poll) (struct file *, struct poll_table_struct *);

	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);

	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);

Documentation/filesystems/porting

+6 −0
Original line number Diff line number Diff line
@@ -445,3 +445,9 @@ object doesn't exist. It's remote/distributed ones that might care... 
[mandatory]

	FS_REVAL_DOT is gone; if you used to have it, add ->d_weak_revalidate()

in your dentry operations instead.

--

[mandatory]

	vfs_readdir() is gone; switch to iterate_dir() instead

--

[mandatory]

	->readdir() is gone now; switch to ->iterate()

Documentation/filesystems/vfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ struct file_operations { 
	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);

	ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);

	ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);

	int (*readdir) (struct file *, void *, filldir_t);

	int (*iterate) (struct file *, struct dir_context *);

	unsigned int (*poll) (struct file *, struct poll_table_struct *);

	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);

	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
@@ -815,7 +815,7 @@ otherwise noted. 


  aio_write: called by io_submit(2) and other asynchronous I/O operations



  readdir: called when the VFS needs to read the directory contents

  iterate: called when the VFS needs to read the directory contents



  poll: called by the VFS when a process wants to check if there is

	activity on this file and (optionally) go to sleep until there

arch/alpha/include/asm/pgtable.h

+0 −3
Original line number Diff line number Diff line
@@ -354,9 +354,6 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) 
#define kern_addr_valid(addr)	(1)

#endif



#define io_remap_pfn_range(vma, start, pfn, size, prot)	\

		remap_pfn_range(vma, start, pfn, size, prot)



#define pte_ERROR(e) \

	printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))

#define pmd_ERROR(e) \

arch/alpha/kernel/osf_sys.c

+8 −7
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ struct osf_dirent { 
};



struct osf_dirent_callback {

	struct dir_context ctx;

	struct osf_dirent __user *dirent;

	long __user *basep;

	unsigned int count;
@@ -146,17 +147,17 @@ SYSCALL_DEFINE4(osf_getdirentries, unsigned int, fd, 
{

	int error;

	struct fd arg = fdget(fd);

	struct osf_dirent_callback buf;

	struct osf_dirent_callback buf = {

		.ctx.actor = osf_filldir,

		.dirent = dirent,

		.basep = basep,

		.count = count

	};



	if (!arg.file)

		return -EBADF;



	buf.dirent = dirent;

	buf.basep = basep;

	buf.count = count;

	buf.error = 0;



	error = vfs_readdir(arg.file, osf_filldir, &buf);

	error = iterate_dir(arg.file, &buf.ctx);

	if (error >= 0)

		error = buf.error;

	if (count != buf.count)

CRA Git | Maintained and supported by SUSTech CRA and CCSE