aio: fix io_setup/io_destroy race

[linux-2.6.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index 64396af37b2a1febd33e10cff58773d186f4c8ca..93804d4d66e1876c55338887bfd0d81f1dd43505 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -7,10 +7,11 @@
 
 obj-y :=       open.o read_write.o file_table.o super.o \
                char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \
-               ioctl.o readdir.o select.o fifo.o locks.o dcache.o inode.o \
-               attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \
+               ioctl.o readdir.o select.o fifo.o dcache.o inode.o \
+               attr.o bad_inode.o file.o filesystems.o namespace.o \
                seq_file.o xattr.o libfs.o fs-writeback.o \
-               pnode.o drop_caches.o splice.o sync.o utimes.o
+               pnode.o drop_caches.o splice.o sync.o utimes.o \
+               stack.o fs_struct.o statfs.o
 
 ifeq ($(CONFIG_BLOCK),y)
 obj-y +=       buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
@@ -18,14 +19,18 @@ else
 obj-y +=       no-block.o
 endif
 
-obj-$(CONFIG_INOTIFY)          += inotify.o
-obj-$(CONFIG_INOTIFY_USER)     += inotify_user.o
+obj-$(CONFIG_PROC_FS) += proc_namespace.o
+
+obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o
+obj-y                          += notify/
 obj-$(CONFIG_EPOLL)            += eventpoll.o
+obj-$(CONFIG_ANON_INODES)      += anon_inodes.o
+obj-$(CONFIG_SIGNALFD)         += signalfd.o
+obj-$(CONFIG_TIMERFD)          += timerfd.o
+obj-$(CONFIG_EVENTFD)          += eventfd.o
+obj-$(CONFIG_AIO)               += aio.o
+obj-$(CONFIG_FILE_LOCKING)      += locks.o
 obj-$(CONFIG_COMPAT)           += compat.o compat_ioctl.o
-
-nfsd-$(CONFIG_NFSD)            := nfsctl.o
-obj-y                          += $(nfsd-y) $(nfsd-m)
-
 obj-$(CONFIG_BINFMT_AOUT)      += binfmt_aout.o
 obj-$(CONFIG_BINFMT_EM86)      += binfmt_em86.o
 obj-$(CONFIG_BINFMT_MISC)      += binfmt_misc.o
@@ -34,6 +39,7 @@ obj-$(CONFIG_BINFMT_MISC)     += binfmt_misc.o
 obj-y                          += binfmt_script.o
 
 obj-$(CONFIG_BINFMT_ELF)       += binfmt_elf.o
+obj-$(CONFIG_COMPAT_BINFMT_ELF)        += compat_binfmt_elf.o
 obj-$(CONFIG_BINFMT_ELF_FDPIC) += binfmt_elf_fdpic.o
 obj-$(CONFIG_BINFMT_SOM)       += binfmt_som.o
 obj-$(CONFIG_BINFMT_FLAT)      += binfmt_flat.o
@@ -43,15 +49,11 @@ obj-$(CONFIG_FS_POSIX_ACL)  += posix_acl.o xattr_acl.o
 obj-$(CONFIG_NFS_COMMON)       += nfs_common/
 obj-$(CONFIG_GENERIC_ACL)      += generic_acl.o
 
-obj-$(CONFIG_QUOTA)            += dquot.o
-obj-$(CONFIG_QFMT_V1)          += quota_v1.o
-obj-$(CONFIG_QFMT_V2)          += quota_v2.o
-obj-$(CONFIG_QUOTACTL)         += quota.o
+obj-$(CONFIG_FHANDLE)          += fhandle.o
 
-obj-$(CONFIG_DNOTIFY)          += dnotify.o
+obj-y                          += quota/
 
 obj-$(CONFIG_PROC_FS)          += proc/
-obj-y                          += partitions/
 obj-$(CONFIG_SYSFS)            += sysfs/
 obj-$(CONFIG_CONFIGFS_FS)      += configfs/
 obj-y                          += devpts/
@@ -60,19 +62,22 @@ obj-$(CONFIG_PROFILING)             += dcookies.o
 obj-$(CONFIG_DLM)              += dlm/
  
 # Do not add any filesystems before this line
+obj-$(CONFIG_FSCACHE)          += fscache/
 obj-$(CONFIG_REISERFS_FS)      += reiserfs/
 obj-$(CONFIG_EXT3_FS)          += ext3/ # Before ext2 so root fs can be ext3
-obj-$(CONFIG_EXT4DEV_FS)       += ext4/ # Before ext2 so root fs can be ext4dev
-obj-$(CONFIG_JBD)              += jbd/
 obj-$(CONFIG_EXT2_FS)          += ext2/
+# We place ext4 after ext2 so plain ext2 root fs's are mounted using ext2
+# unless explicitly requested by rootfstype
+obj-$(CONFIG_EXT4_FS)          += ext4/
+obj-$(CONFIG_JBD)              += jbd/
+obj-$(CONFIG_JBD2)             += jbd2/
 obj-$(CONFIG_CRAMFS)           += cramfs/
-obj-$(CONFIG_RAMFS)            += ramfs/
+obj-$(CONFIG_SQUASHFS)         += squashfs/
+obj-y                          += ramfs/
 obj-$(CONFIG_HUGETLBFS)                += hugetlbfs/
 obj-$(CONFIG_CODA_FS)          += coda/
 obj-$(CONFIG_MINIX_FS)         += minix/
 obj-$(CONFIG_FAT_FS)           += fat/
-obj-$(CONFIG_MSDOS_FS)         += msdos/
-obj-$(CONFIG_VFAT_FS)          += vfat/
 obj-$(CONFIG_BFS_FS)           += bfs/
 obj-$(CONFIG_ISO9660_FS)       += isofs/
 obj-$(CONFIG_HFSPLUS_FS)       += hfsplus/ # Before hfs to find wrapped HFS+
@@ -85,31 +90,37 @@ obj-$(CONFIG_NFSD)          += nfsd/
 obj-$(CONFIG_LOCKD)            += lockd/
 obj-$(CONFIG_NLS)              += nls/
 obj-$(CONFIG_SYSV_FS)          += sysv/
-obj-$(CONFIG_SMB_FS)           += smbfs/
 obj-$(CONFIG_CIFS)             += cifs/
 obj-$(CONFIG_NCP_FS)           += ncpfs/
 obj-$(CONFIG_HPFS_FS)          += hpfs/
 obj-$(CONFIG_NTFS_FS)          += ntfs/
 obj-$(CONFIG_UFS_FS)           += ufs/
 obj-$(CONFIG_EFS_FS)           += efs/
-obj-$(CONFIG_JFFS_FS)          += jffs/
 obj-$(CONFIG_JFFS2_FS)         += jffs2/
+obj-$(CONFIG_LOGFS)            += logfs/
+obj-$(CONFIG_UBIFS_FS)         += ubifs/
 obj-$(CONFIG_AFFS_FS)          += affs/
 obj-$(CONFIG_ROMFS_FS)         += romfs/
 obj-$(CONFIG_QNX4FS_FS)                += qnx4/
-obj-$(CONFIG_AUTOFS_FS)                += autofs/
 obj-$(CONFIG_AUTOFS4_FS)       += autofs4/
 obj-$(CONFIG_ADFS_FS)          += adfs/
 obj-$(CONFIG_FUSE_FS)          += fuse/
 obj-$(CONFIG_UDF_FS)           += udf/
 obj-$(CONFIG_SUN_OPENPROMFS)   += openpromfs/
+obj-$(CONFIG_OMFS_FS)          += omfs/
 obj-$(CONFIG_JFS_FS)           += jfs/
 obj-$(CONFIG_XFS_FS)           += xfs/
 obj-$(CONFIG_9P_FS)            += 9p/
 obj-$(CONFIG_AFS_FS)           += afs/
+obj-$(CONFIG_NILFS2_FS)                += nilfs2/
 obj-$(CONFIG_BEFS_FS)          += befs/
 obj-$(CONFIG_HOSTFS)           += hostfs/
 obj-$(CONFIG_HPPFS)            += hppfs/
+obj-$(CONFIG_CACHEFILES)       += cachefiles/
 obj-$(CONFIG_DEBUG_FS)         += debugfs/
 obj-$(CONFIG_OCFS2_FS)         += ocfs2/
+obj-$(CONFIG_BTRFS_FS)         += btrfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
+obj-y                          += exofs/ # Multiple modules
+obj-$(CONFIG_CEPH_FS)          += ceph/
+obj-$(CONFIG_PSTORE)           += pstore/