Commit 52ab3f3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://oss.sgi.com:8090/xfs-2.6 

* git://oss.sgi.com:8090/xfs-2.6: (43 commits)
  [XFS] Remove files from the build that are now unused.
  [XFS] Fix a Makefile issue related to exports.o handling.
  [XFS] Remove version 1 directory code.	Never functioned on Linux, just
  [XFS] Map EFSCORRUPTED to an actual error code, not just a made up one
  [XFS] Kill direct access to ->count in valusema(); all we ever use it for
  [XFS] Remove unneeded conditional code on NFS export interface related
  [XFS] Remove an incorrect use of unlikely() on a relatively likely code
  [XFS] Push some common code out of write path into core XFS code for
  [XFS] Remove unnecessary local from open_exec dmapi path.
  [XFS] Minor XFS documentation updates.
  [XFS] Fix broken const use inside local suffix_strtoul routine.
  [XFS] Fix nused counter.  It's currently getting set to -1 rather than
  [XFS] Fix mismerge of the fs_writable cleanup patch causing a freeze/thaw
  [XFS] Fix up debug code so that bulkstat wont generate thousands of
  [XFS] Remove unused parameter from di2xflags routine.
  [XFS] Cleanup a missed porting conversion, and freezing.
  [XFS] Resolve a namespace collision on remaining vtypes for FreeBSD
  [XFS] Resolve a namespace collision on vnode/vnodeops for FreeBSD porters.
  [XFS] Resolve a namespace collision on vfs/vfsops for FreeBSD porters.
  [XFS] statvfs component of directory/project quota support, code
  ...
parents 43104f1d 98174e46

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3191,7 +3191,7 @@ XFS FILESYSTEM 
P:	Silicon Graphics Inc

M:	xfs-masters@oss.sgi.com

M:	nathans@sgi.com

L:	linux-xfs@oss.sgi.com

L:	xfs@oss.sgi.com

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

S:	Supported

fs/xfs/Kconfig

+11 −16
Original line number Diff line number Diff line 
config XFS_FS

	tristate "XFS filesystem support"

	select EXPORTFS if NFSD!=n

	help

	  XFS is a high performance journaling filesystem which originated

	  on the SGI IRIX platform.  It is completely multi-threaded, can
@@ -18,11 +17,6 @@ config XFS_FS 
	  system of your root partition is compiled as a module, you'll need

	  to use an initial ramdisk (initrd) to boot.



config XFS_EXPORT

	bool

	depends on XFS_FS && EXPORTFS

	default y



config XFS_QUOTA

	bool "XFS Quota support"

	depends on XFS_FS
@@ -65,18 +59,19 @@ config XFS_POSIX_ACL 
	  If you don't know what Access Control Lists are, say N.



config XFS_RT

	bool "XFS Realtime support (EXPERIMENTAL)"

	depends on XFS_FS && EXPERIMENTAL

	bool "XFS Realtime subvolume support"

	depends on XFS_FS

	help

	  If you say Y here you will be able to mount and use XFS filesystems

	  which contain a realtime subvolume.  The realtime subvolume is a

	  separate area of disk space where only file data is stored. The

	  realtime subvolume is designed to provide very deterministic

	  data rates suitable for media streaming applications.



	  See the xfs man page in section 5 for a bit more information.

	  separate area of disk space where only file data is stored.  It was

	  originally designed to provide deterministic data rates suitable

	  for media streaming applications, but is also useful as a generic

	  mechanism for ensuring data and metadata/log I/Os are completely

	  separated.  Regular file I/Os are isolated to a separate device

	  from all other requests, and this can be done quite transparently

	  to applications via the inherit-realtime directory inode flag.



	  This feature is unsupported at this time, is not yet fully

	  functional, and may cause serious problems.

	  See the xfs man page in section 5 for additional information.



	  If unsure, say N.

fs/xfs/Makefile-linux-2.6

+1 −3
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o 
xfs-$(CONFIG_PROC_FS)		+= $(XFS_LINUX)/xfs_stats.o

xfs-$(CONFIG_SYSCTL)		+= $(XFS_LINUX)/xfs_sysctl.o

xfs-$(CONFIG_COMPAT)		+= $(XFS_LINUX)/xfs_ioctl32.o

xfs-$(CONFIG_XFS_EXPORT)	+= $(XFS_LINUX)/xfs_export.o





xfs-y				+= xfs_alloc.o \
@@ -73,14 +72,12 @@ xfs-y += xfs_alloc.o \ 
				   xfs_btree.o \

				   xfs_buf_item.o \

				   xfs_da_btree.o \

				   xfs_dir.o \

				   xfs_dir2.o \

				   xfs_dir2_block.o \

				   xfs_dir2_data.o \

				   xfs_dir2_leaf.o \

				   xfs_dir2_node.o \

				   xfs_dir2_sf.o \

				   xfs_dir_leaf.o \

				   xfs_error.o \

				   xfs_extfree_item.o \

				   xfs_fsops.o \
@@ -117,6 +114,7 @@ xfs-y += $(addprefix $(XFS_LINUX)/, \ 
				   kmem.o \

				   xfs_aops.o \

				   xfs_buf.o \

				   xfs_export.o \

				   xfs_file.o \

				   xfs_fs_subr.o \

				   xfs_globals.o \

fs/xfs/linux-2.6/kmem.h

+1 −37
Original line number Diff line number Diff line
@@ -22,42 +22,6 @@ 
#include <linux/sched.h>

#include <linux/mm.h>



/*

 * Process flags handling

 */



#define PFLAGS_TEST_NOIO()              (current->flags & PF_NOIO)

#define PFLAGS_TEST_FSTRANS()           (current->flags & PF_FSTRANS)



#define PFLAGS_SET_NOIO() do {		\

	current->flags |= PF_NOIO;	\

} while (0)



#define PFLAGS_CLEAR_NOIO() do {	\

	current->flags &= ~PF_NOIO;	\

} while (0)



/* these could be nested, so we save state */

#define PFLAGS_SET_FSTRANS(STATEP) do {	\

	*(STATEP) = current->flags;	\

	current->flags |= PF_FSTRANS;	\

} while (0)



#define PFLAGS_CLEAR_FSTRANS(STATEP) do { \

	*(STATEP) = current->flags;	\

	current->flags &= ~PF_FSTRANS;	\

} while (0)



/* Restore the PF_FSTRANS state to what was saved in STATEP */

#define PFLAGS_RESTORE_FSTRANS(STATEP) do {     		\

	current->flags = ((current->flags & ~PF_FSTRANS) |	\

			  (*(STATEP) & PF_FSTRANS));		\

} while (0)



#define PFLAGS_DUP(OSTATEP, NSTATEP) do { \

	*(NSTATEP) = *(OSTATEP);	\

} while (0)



/*

 * General memory allocation interfaces

 */
@@ -83,7 +47,7 @@ kmem_flags_convert(unsigned int __nocast flags) 
		lflags = GFP_ATOMIC | __GFP_NOWARN;

	} else {

		lflags = GFP_KERNEL | __GFP_NOWARN;

		if (PFLAGS_TEST_FSTRANS() || (flags & KM_NOFS))

		if ((current->flags & PF_FSTRANS) || (flags & KM_NOFS))

			lflags &= ~__GFP_FS;

	}

	return lflags;

fs/xfs/linux-2.6/mrlock.h

+2 −2
Original line number Diff line number Diff line 
/*

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

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

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@ typedef struct { 
} mrlock_t;



#define mrinit(mrp, name)	\

	( (mrp)->mr_writer = 0, init_rwsem(&(mrp)->mr_lock) )

	do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0)

#define mrlock_init(mrp, t,n,s)	mrinit(mrp, n)

#define mrfree(mrp)		do { } while (0)

#define mraccess(mrp)		mraccessf(mrp, 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE