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

Commit ac7c1a77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs 

* 'for-linus' of git://oss.sgi.com/xfs/xfs: (61 commits)
  Revert "xfs: increase the maximum number of supported ACL entries"
  xfs: cleanup uuid handling
  xfs: remove m_attroffset
  xfs: fix various typos
  xfs: pagecache usage optimization
  xfs: remove m_litino
  xfs: kill ino64 mount option
  xfs: kill mutex_t typedef
  xfs: increase the maximum number of supported ACL entries
  xfs: factor out code to find the longest free extent in the AG
  xfs: kill VN_BAD
  xfs: kill vn_atime_* helpers.
  xfs: cleanup xlog_bread
  xfs: cleanup xlog_recover_do_trans
  xfs: remove another leftover of the old inode log item format
  xfs: cleanup log unmount handling
  Fix xfs debug build breakage by pushing xfs_error.h after
  xfs: include header files for prototypes
  xfs: make symbols static
  xfs: move declaration to header file
  ...
parents 3ba113d1 f36345ff

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -4969,7 +4969,8 @@ S: Supported 


XFS FILESYSTEM

P:	Silicon Graphics Inc

P:	Bill O'Donnell

P:	Felix Blyakher

M:	felixb@sgi.com

M:	xfs-masters@oss.sgi.com

L:	xfs@oss.sgi.com

W:	http://oss.sgi.com/projects/xfs

fs/xfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \ 
				   xfs_qm_syscalls.o \

				   xfs_qm_bhv.o \

				   xfs_qm.o)

xfs-$(CONFIG_XFS_QUOTA)		+= linux-2.6/xfs_quotaops.o



ifeq ($(CONFIG_XFS_QUOTA),y)

xfs-$(CONFIG_PROC_FS)		+= quota/xfs_qm_stats.o

fs/xfs/linux-2.6/mutex.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#ifndef __XFS_SUPPORT_MUTEX_H__

#define __XFS_SUPPORT_MUTEX_H__



#include <linux/mutex.h>



typedef struct mutex mutex_t;



#endif /* __XFS_SUPPORT_MUTEX_H__ */

fs/xfs/linux-2.6/xfs_aops.c

+1 −0
Original line number Diff line number Diff line
@@ -1623,4 +1623,5 @@ const struct address_space_operations xfs_address_space_operations = { 
	.bmap			= xfs_vm_bmap,

	.direct_IO		= xfs_vm_direct_IO,

	.migratepage		= buffer_migrate_page,

	.is_partially_uptodate  = block_is_partially_uptodate,

};

fs/xfs/linux-2.6/xfs_ioctl.c

+45 −62
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "xfs_dir2_sf.h"

#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_ioctl.h"

#include "xfs_btree.h"

#include "xfs_ialloc.h"

#include "xfs_rtalloc.h"
@@ -78,92 +79,74 @@ xfs_find_handle( 
	int			hsize;

	xfs_handle_t		handle;

	struct inode		*inode;



	memset((char *)&handle, 0, sizeof(handle));



	switch (cmd) {

	case XFS_IOC_PATH_TO_FSHANDLE:

	case XFS_IOC_PATH_TO_HANDLE: {

	struct file		*file = NULL;

	struct path		path;

		int error = user_lpath((const char __user *)hreq->path, &path);

		if (error)

			return error;



		ASSERT(path.dentry);

		ASSERT(path.dentry->d_inode);

		inode = igrab(path.dentry->d_inode);

		path_put(&path);

		break;

	}



	case XFS_IOC_FD_TO_HANDLE: {

		struct file	*file;

	int			error;

	struct xfs_inode	*ip;



	if (cmd == XFS_IOC_FD_TO_HANDLE) {

		file = fget(hreq->fd);

		if (!file)

			return -EBADF;



		ASSERT(file->f_path.dentry);

		ASSERT(file->f_path.dentry->d_inode);

		inode = igrab(file->f_path.dentry->d_inode);

		fput(file);

		break;

		inode = file->f_path.dentry->d_inode;

	} else {

		error = user_lpath((const char __user *)hreq->path, &path);

		if (error)

			return error;

		inode = path.dentry->d_inode;

	}

	ip = XFS_I(inode);



	default:

		ASSERT(0);

		return -XFS_ERROR(EINVAL);

	}

	/*

	 * We can only generate handles for inodes residing on a XFS filesystem,

	 * and only for regular files, directories or symbolic links.

	 */

	error = -EINVAL;

	if (inode->i_sb->s_magic != XFS_SB_MAGIC)

		goto out_put;



	if (inode->i_sb->s_magic != XFS_SB_MAGIC) {

		/* we're not in XFS anymore, Toto */

		iput(inode);

		return -XFS_ERROR(EINVAL);

	}

	error = -EBADF;

	if (!S_ISREG(inode->i_mode) &&

	    !S_ISDIR(inode->i_mode) &&

	    !S_ISLNK(inode->i_mode))

		goto out_put;



	switch (inode->i_mode & S_IFMT) {

	case S_IFREG:

	case S_IFDIR:

	case S_IFLNK:

		break;

	default:

		iput(inode);

		return -XFS_ERROR(EBADF);

	}



	/* now we can grab the fsid */

	memcpy(&handle.ha_fsid, XFS_I(inode)->i_mount->m_fixedfsid,

			sizeof(xfs_fsid_t));

	hsize = sizeof(xfs_fsid_t);

	memcpy(&handle.ha_fsid, ip->i_mount->m_fixedfsid, sizeof(xfs_fsid_t));



	if (cmd != XFS_IOC_PATH_TO_FSHANDLE) {

		xfs_inode_t	*ip = XFS_I(inode);

	if (cmd == XFS_IOC_PATH_TO_FSHANDLE) {

		/*

		 * This handle only contains an fsid, zero the rest.

		 */

		memset(&handle.ha_fid, 0, sizeof(handle.ha_fid));

		hsize = sizeof(xfs_fsid_t);

	} else {

		int		lock_mode;



		/* need to get access to the xfs_inode to read the generation */

		lock_mode = xfs_ilock_map_shared(ip);



		/* fill in fid section of handle from inode */

		handle.ha_fid.fid_len = sizeof(xfs_fid_t) -

					sizeof(handle.ha_fid.fid_len);

		handle.ha_fid.fid_pad = 0;

		handle.ha_fid.fid_gen = ip->i_d.di_gen;

		handle.ha_fid.fid_ino = ip->i_ino;



		xfs_iunlock_map_shared(ip, lock_mode);



		hsize = XFS_HSIZE(handle);

	}



	/* now copy our handle into the user buffer & write out the size */

	error = -EFAULT;

	if (copy_to_user(hreq->ohandle, &handle, hsize) ||

	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) {

		iput(inode);

		return -XFS_ERROR(EFAULT);

	}

	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))

		goto out_put;



	iput(inode);

	return 0;

	error = 0;



 out_put:

	if (cmd == XFS_IOC_FD_TO_HANDLE)

		fput(file);

	else

		path_put(&path);

	return error;

}



/*