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

Commit 0110c350 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 more vfs updates from Al Viro:
 "In this pile:

   - autofs-namespace series
   - dedupe stuff
   - more struct path constification"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (40 commits)
  ocfs2: implement the VFS clone_range, copy_range, and dedupe_range features
  ocfs2: charge quota for reflinked blocks
  ocfs2: fix bad pointer cast
  ocfs2: always unlock when completing dio writes
  ocfs2: don't eat io errors during _dio_end_io_write
  ocfs2: budget for extent tree splits when adding refcount flag
  ocfs2: prohibit refcounted swapfiles
  ocfs2: add newlines to some error messages
  ocfs2: convert inode refcount test to a helper
  simple_write_end(): don't zero in short copy into uptodate
  exofs: don't mess with simple_write_{begin,end}
  9p: saner ->write_end() on failing copy into non-uptodate page
  fix gfs2_stuffed_write_end() on short copies
  fix ceph_write_end()
  nfs_write_end(): fix handling of short copies
  vfs: refactor clone/dedupe_file_range common functions
  fs: try to clone files first in vfs_copy_file_range
  vfs: misc struct path constification
  namespace.c: constify struct path passed to a bunch of primitives
  quota: constify struct path in quota_on
  ...
parents d9cb5bfc 9763f7a4

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ prototypes: 
	void (*d_iput)(struct dentry *, struct inode *);

	char *(*d_dname)((struct dentry *dentry, char *buffer, int buflen);

	struct vfsmount *(*d_automount)(struct path *path);

	int (*d_manage)(struct dentry *, bool);

	int (*d_manage)(const struct path *, bool);

	struct dentry *(*d_real)(struct dentry *, const struct inode *,

				 unsigned int);

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ struct dentry_operations { 
	void (*d_iput)(struct dentry *, struct inode *);

	char *(*d_dname)(struct dentry *, char *, int);

	struct vfsmount *(*d_automount)(struct path *);

	int (*d_manage)(struct dentry *, bool);

	int (*d_manage)(const struct path *, bool);

	struct dentry *(*d_real)(struct dentry *, const struct inode *,

				 unsigned int);

};

arch/powerpc/oprofile/cell/spu_task_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int release_cached_info(int spu_index) 
 * dcookie user still being registered (namely, the reader

 * of the event buffer).

 */

static inline unsigned long fast_get_dcookie(struct path *path)

static inline unsigned long fast_get_dcookie(const struct path *path)

{

	unsigned long cookie;

drivers/oprofile/buffer_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ void sync_stop(void) 
 * because we cannot reach this code without at least one

 * dcookie user still being registered (namely, the reader

 * of the event buffer). */

static inline unsigned long fast_get_dcookie(struct path *path)

static inline unsigned long fast_get_dcookie(const struct path *path)

{

	unsigned long cookie;

fs/9p/vfs_addr.c

+4 −11
Original line number Diff line number Diff line
@@ -310,18 +310,10 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping, 


	p9_debug(P9_DEBUG_VFS, "filp %p, mapping %p\n", filp, mapping);



	if (unlikely(copied < len)) {

		/*

		 * zero out the rest of the area

		 */

		unsigned from = pos & (PAGE_SIZE - 1);



		zero_user(page, from + copied, len - copied);

		flush_dcache_page(page);

	if (unlikely(copied < len && !PageUptodate(page))) {

		copied = 0;

		goto out;

	}



	if (!PageUptodate(page))

		SetPageUptodate(page);

	/*

	 * No need to use i_size_read() here, the i_size

	 * cannot change under us because we hold the i_mutex.
@@ -331,6 +323,7 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping, 
		i_size_write(inode, last_pos);

	}

	set_page_dirty(page);

out:

	unlock_page(page);

	put_page(page);