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

Commit 89ad6a61 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-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  remove detritus left by "mm: make read_cache_page synchronous"
  fix fs/sysv s_dirt handling
  fat: convert to use the new truncate convention.
  ext2: convert to use the new truncate convention.
  tmpfs: convert to use the new truncate convention
  fs: convert simple fs to new truncate
  kill spurious reference to vmtruncate
  fs: introduce new truncate sequence
  fs/super: fix kernel-doc warning
  fs/minix: bugfix, number of indirect block ptrs per block depends on block size
  rename the generic fsync implementations
  drop unused dentry argument to ->fsync
  fs: Add missing mutex_unlock
  Fix racy use of anon_inode_getfd() in perf_event.c
  get rid of the magic around f_count in aio
  VFS: fix recent breakage of FS_REVAL_DOT
  Revert "anon_inode: set S_IFREG on the anon_inode"
parents aa36c7bf 49837a80

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ prototypes: 
	int (*open) (struct inode *, struct file *);

	int (*flush) (struct file *);

	int (*release) (struct inode *, struct file *);

	int (*fsync) (struct file *, struct dentry *, int datasync);

	int (*fsync) (struct file *, int datasync);

	int (*aio_fsync) (struct kiocb *, int datasync);

	int (*fasync) (int, struct file *, int);

	int (*lock) (struct file *, int, struct file_lock *);

Documentation/filesystems/vfs.txt

+7 −2
Original line number Diff line number Diff line
@@ -401,11 +401,16 @@ otherwise noted. 
  	started might not be in the page cache at the end of the

  	walk).



  truncate: called by the VFS to change the size of a file.  The

  truncate: Deprecated. This will not be called if ->setsize is defined.

	Called by the VFS to change the size of a file.  The

 	i_size field of the inode is set to the desired size by the

 	VFS before this method is called.  This method is called by

 	the truncate(2) system call and related functionality.



	Note: ->truncate and vmtruncate are deprecated. Do not add new

	instances/calls of these. Filesystems should be converted to do their

	truncate sequence via ->setattr().



  permission: called by the VFS to check for access rights on a POSIX-like

  	filesystem.
@@ -729,7 +734,7 @@ struct file_operations { 
	int (*open) (struct inode *, struct file *);

	int (*flush) (struct file *);

	int (*release) (struct inode *, struct file *);

	int (*fsync) (struct file *, struct dentry *, int datasync);

	int (*fsync) (struct file *, int datasync);

	int (*aio_fsync) (struct kiocb *, int datasync);

	int (*fasync) (int, struct file *, int);

	int (*lock) (struct file *, int, struct file_lock *);

arch/powerpc/platforms/cell/spufs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -1849,8 +1849,7 @@ static int spufs_mfc_flush(struct file *file, fl_owner_t id) 
	return ret;

}



static int spufs_mfc_fsync(struct file *file, struct dentry *dentry,

			   int datasync)

static int spufs_mfc_fsync(struct file *file, int datasync)

{

	return spufs_mfc_flush(file, NULL);

}

arch/powerpc/platforms/cell/spufs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ const struct file_operations spufs_context_fops = { 
	.llseek		= dcache_dir_lseek,

	.read		= generic_read_dir,

	.readdir	= dcache_readdir,

	.fsync		= simple_sync_file,

	.fsync		= noop_fsync,

};

EXPORT_SYMBOL_GPL(spufs_context_fops);

drivers/char/ps3flash.c

+1 −2
Original line number Diff line number Diff line
@@ -305,8 +305,7 @@ static int ps3flash_flush(struct file *file, fl_owner_t id) 
	return ps3flash_writeback(ps3flash_dev);

}



static int ps3flash_fsync(struct file *file, struct dentry *dentry,

			  int datasync)

static int ps3flash_fsync(struct file *file, int datasync)

{

	return ps3flash_writeback(ps3flash_dev);

}