Commit 8fe74cf0 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-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  Remove two unneeded exports and make two symbols static in fs/mpage.c
  Cleanup after commit 585d3bc0
  Trim includes of fdtable.h
  Don't crap into descriptor table in binfmt_som
  Trim includes in binfmt_elf
  Don't mess with descriptor table in load_elf_binary()
  Get rid of indirect include of fs_struct.h
  New helper - current_umask()
  check_unsafe_exec() doesn't care about signal handlers sharing
  New locking/refcounting for fs_struct
  Take fs_struct handling to new file (fs/fs_struct.c)
  Get rid of bumping fs_struct refcount in pivot_root(2)
  Kill unsharing fs_struct in __set_personality()
parents c2eb2fa6 ced117c7

arch/cris/kernel/process.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <asm/system.h>

#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/fs_struct.h>

#include <linux/init_task.h>

#include <linux/sched.h>

#include <linux/fs.h>

arch/powerpc/platforms/cell/spufs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ long spufs_create(struct nameidata *nd, unsigned int flags, mode_t mode, 
	if (dentry->d_inode)

		goto out_dput;



	mode &= ~current->fs->umask;

	mode &= ~current_umask();



	if (flags & SPU_CREATE_GANG)

		ret = spufs_create_gang(nd->path.dentry->d_inode,

drivers/char/tty_audit.c

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
 */



#include <linux/audit.h>

#include <linux/file.h>

#include <linux/fdtable.h>

#include <linux/tty.h>



struct tty_audit_buf {

drivers/char/tty_ldisc.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/tty_flip.h>

#include <linux/devpts_fs.h>

#include <linux/file.h>

#include <linux/fdtable.h>

#include <linux/console.h>

#include <linux/timer.h>

#include <linux/ctype.h>

fs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-y := open.o read_write.o file_table.o super.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 \

		stack.o

		stack.o fs_struct.o



ifeq ($(CONFIG_BLOCK),y)

obj-y +=	buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE