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

Commit 93aaa830 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-pnfs-for-linus-3.20-rc1' of... 

Merge tag 'xfs-pnfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs

Pull xfs pnfs block layout support from Dave Chinner:
 "This contains the changes to XFS needed to support the PNFS block
  layout server that you pulled in through Bruce's NFS server tree
  merge.

  I originally thought that I'd need to merge changes into the NFS
  server side, but Bruce had already picked them up and so this is
  purely changes to the fs/xfs/ codebase.

  Summary:

  This update contains the implementation of the PNFS server export
  methods that enable use of XFS filesystems as a block layout target"

* tag 'xfs-pnfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs:
  xfs: recall pNFS layouts on conflicting access
  xfs: implement pNFS export operations
parents 24a52e41 781355c6

fs/xfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -121,3 +121,4 @@ xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o 
xfs-$(CONFIG_PROC_FS)		+= xfs_stats.o

xfs-$(CONFIG_SYSCTL)		+= xfs_sysctl.o

xfs-$(CONFIG_COMPAT)		+= xfs_ioctl32.o

xfs-$(CONFIG_NFSD_PNFS)		+= xfs_pnfs.o

fs/xfs/xfs_export.c

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "xfs_trace.h"

#include "xfs_icache.h"

#include "xfs_log.h"

#include "xfs_pnfs.h"



/*

 * Note that we only accept fileids which are long enough rather than allow
@@ -245,4 +246,9 @@ const struct export_operations xfs_export_operations = { 
	.fh_to_parent		= xfs_fs_fh_to_parent,

	.get_parent		= xfs_fs_get_parent,

	.commit_metadata	= xfs_fs_nfs_commit_metadata,

#ifdef CONFIG_NFSD_PNFS

	.get_uuid		= xfs_fs_get_uuid,

	.map_blocks		= xfs_fs_map_blocks,

	.commit_blocks		= xfs_fs_commit_blocks,

#endif

};

fs/xfs/xfs_file.c

+12 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "xfs_trace.h"

#include "xfs_log.h"

#include "xfs_icache.h"

#include "xfs_pnfs.h"



#include <linux/aio.h>

#include <linux/dcache.h>
@@ -554,6 +555,10 @@ xfs_file_aio_write_checks( 
	if (error)

		return error;



	error = xfs_break_layouts(inode, iolock);

	if (error)

		return error;



	/*

	 * If the offset is beyond the size of the file, we need to zero any

	 * blocks that fall between the existing EOF and the start of this
@@ -822,6 +827,7 @@ xfs_file_fallocate( 
	struct xfs_inode	*ip = XFS_I(inode);

	long			error;

	enum xfs_prealloc_flags	flags = 0;

	uint			iolock = XFS_IOLOCK_EXCL;

	loff_t			new_size = 0;



	if (!S_ISREG(inode->i_mode))
@@ -830,7 +836,11 @@ xfs_file_fallocate( 
		     FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE))

		return -EOPNOTSUPP;



	xfs_ilock(ip, XFS_IOLOCK_EXCL);

	xfs_ilock(ip, iolock);

	error = xfs_break_layouts(inode, &iolock);

	if (error)

		goto out_unlock;



	if (mode & FALLOC_FL_PUNCH_HOLE) {

		error = xfs_free_file_space(ip, offset, len);

		if (error)
@@ -894,7 +904,7 @@ xfs_file_fallocate( 
	}



out_unlock:

	xfs_iunlock(ip, XFS_IOLOCK_EXCL);

	xfs_iunlock(ip, iolock);

	return error;

}

fs/xfs/xfs_fsops.c

+6 −0
Original line number Diff line number Diff line
@@ -602,6 +602,12 @@ xfs_growfs_data( 
	if (!mutex_trylock(&mp->m_growlock))

		return -EWOULDBLOCK;

	error = xfs_growfs_data_private(mp, in);

	/*

	 * Increment the generation unconditionally, the error could be from

	 * updating the secondary superblocks, in which case the new size

	 * is live already.

	 */

	mp->m_generation++;

	mutex_unlock(&mp->m_growlock);

	return error;

}

fs/xfs/xfs_ioctl.c

+7 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "xfs_icache.h"

#include "xfs_symlink.h"

#include "xfs_trans.h"

#include "xfs_pnfs.h"



#include <linux/capability.h>

#include <linux/dcache.h>
@@ -608,6 +609,7 @@ xfs_ioc_space( 
{

	struct iattr		iattr;

	enum xfs_prealloc_flags	flags = 0;

	uint			iolock = XFS_IOLOCK_EXCL;

	int			error;



	/*
@@ -636,7 +638,10 @@ xfs_ioc_space( 
	if (error)

		return error;



	xfs_ilock(ip, XFS_IOLOCK_EXCL);

	xfs_ilock(ip, iolock);

	error = xfs_break_layouts(inode, &iolock);

	if (error)

		goto out_unlock;



	switch (bf->l_whence) {

	case 0: /*SEEK_SET*/
@@ -725,7 +730,7 @@ xfs_ioc_space( 
	error = xfs_update_prealloc_flags(ip, flags);



out_unlock:

	xfs_iunlock(ip, XFS_IOLOCK_EXCL);

	xfs_iunlock(ip, iolock);

	mnt_drop_write_file(filp);

	return error;

}