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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits)
  direct I/O fallback sync simplification
  ocfs: stop using do_sync_mapping_range
  cleanup blockdev_direct_IO locking
  make generic_acl slightly more generic
  sanitize xattr handler prototypes
  libfs: move EXPORT_SYMBOL for d_alloc_name
  vfs: force reval of target when following LAST_BIND symlinks (try #7)
  ima: limit imbalance msg
  Untangling ima mess, part 3: kill dead code in ima
  Untangling ima mess, part 2: deal with counters
  Untangling ima mess, part 1: alloc_file()
  O_TRUNC open shouldn't fail after file truncation
  ima: call ima_inode_free ima_inode_free
  IMA: clean up the IMA counts updating code
  ima: only insert at inode creation time
  ima: valid return code from ima_inode_alloc
  fs: move get_empty_filp() deffinition to internal.h
  Sanitize exec_permission_lite()
  Kill cached_lookup() and real_lookup()
  Kill path_lookup_open()
  ...

Trivial conflicts in fs/direct-io.c
parents 529e8943 c05c4edd

arch/ia64/kernel/perfmon.c

+8 −7
Original line number Diff line number Diff line
@@ -2200,7 +2200,7 @@ pfm_alloc_file(pfm_context_t *ctx) 
{

	struct file *file;

	struct inode *inode;

	struct dentry *dentry;

	struct path path;

	char name[32];

	struct qstr this;
@@ -2225,18 +2225,19 @@ pfm_alloc_file(pfm_context_t *ctx) 
	/*

	 * allocate a new dcache entry

	 */

	dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);

	if (!dentry) {

	path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);

	if (!path.dentry) {

		iput(inode);

		return ERR_PTR(-ENOMEM);

	}

	path.mnt = mntget(pfmfs_mnt);



	dentry->d_op = &pfmfs_dentry_operations;

	d_add(dentry, inode);

	path.dentry->d_op = &pfmfs_dentry_operations;

	d_add(path.dentry, inode);



	file = alloc_file(pfmfs_mnt, dentry, FMODE_READ, &pfm_file_ops);

	file = alloc_file(&path, FMODE_READ, &pfm_file_ops);

	if (!file) {

		dput(dentry);

		path_put(&path);

		return ERR_PTR(-ENFILE);

	}

arch/parisc/hpux/sys_hpux.c

+1 −6
Original line number Diff line number Diff line
@@ -445,12 +445,7 @@ int hpux_getdomainname(char __user *name, int len) 


int hpux_pipe(int *kstack_fildes)

{

	int error;



	lock_kernel();

	error = do_pipe_flags(kstack_fildes, 0);

	unlock_kernel();

	return error;

	return do_pipe_flags(kstack_fildes, 0);

}



/* lies - says it works, but it really didn't lock anything */

arch/x86/include/asm/sys_ia32.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ struct mmap_arg_struct; 
asmlinkage long sys32_mmap(struct mmap_arg_struct __user *);

asmlinkage long sys32_mprotect(unsigned long, size_t, unsigned long);



asmlinkage long sys32_pipe(int __user *);

struct sigaction32;

struct old_sigaction32;

asmlinkage long sys32_rt_sigaction(int, struct sigaction32 __user *,

arch/xtensa/include/asm/syscall.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ struct pt_regs; 
struct sigaction;

asmlinkage long xtensa_execve(char*, char**, char**, struct pt_regs*);

asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*);

asmlinkage long xtensa_pipe(int __user *);

asmlinkage long xtensa_ptrace(long, long, long, long);

asmlinkage long xtensa_sigreturn(struct pt_regs*);

asmlinkage long xtensa_rt_sigreturn(struct pt_regs*);

arch/xtensa/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ __SYSCALL( 35, sys_readlink, 3) 
#define __NR_mknod 				 36

__SYSCALL( 36, sys_mknod, 3)

#define __NR_pipe 				 37

__SYSCALL( 37, xtensa_pipe, 1)

__SYSCALL( 37, sys_pipe, 1)

#define __NR_unlink 				 38

__SYSCALL( 38, sys_unlink, 1)

#define __NR_rmdir 				 39