Commit 3ae5080f 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: (37 commits)
  fs: avoid I_NEW inodes
  Merge code for single and multiple-instance mounts
  Remove get_init_pts_sb()
  Move common mknod_ptmx() calls into caller
  Parse mount options just once and copy them to super block
  Unroll essentials of do_remount_sb() into devpts
  vfs: simple_set_mnt() should return void
  fs: move bdev code out of buffer.c
  constify dentry_operations: rest
  constify dentry_operations: configfs
  constify dentry_operations: sysfs
  constify dentry_operations: JFS
  constify dentry_operations: OCFS2
  constify dentry_operations: GFS2
  constify dentry_operations: FAT
  constify dentry_operations: FUSE
  constify dentry_operations: procfs
  constify dentry_operations: ecryptfs
  constify dentry_operations: CIFS
  constify dentry_operations: AFS
  ...
parents 2c9e15a0 aabb8fdb

arch/alpha/kernel/entry.S

+2 −1
Original line number Diff line number Diff line
@@ -903,8 +903,9 @@ sys_alpha_pipe: 
	stq	$26, 0($sp)

	.prologue 0



	mov	$31, $17

	lda	$16, 8($sp)

	jsr	$26, do_pipe

	jsr	$26, do_pipe_flags



	ldq	$26, 0($sp)

	bne	$0, 1f

arch/alpha/kernel/osf_sys.c

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
#include <asm/hwrpb.h>

#include <asm/processor.h>



extern int do_pipe(int *);



/*

 * Brk needs to return an error.  Still support Linux's brk(0) query idiom,

 * which OSF programs just shouldn't be doing.  We're still not quite

arch/ia64/ia32/ia32_entry.S

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ ia32_syscall_table: 
	data8 sys_ni_syscall

	data8 sys_umask		  /* 60 */

	data8 sys_chroot

	data8 sys_ustat

	data8 compat_sys_ustat

	data8 sys_dup2

	data8 sys_getppid

	data8 sys_getpgrp	  /* 65 */

arch/ia64/kernel/perfmon.c

+1 −1
Original line number Diff line number Diff line
@@ -2196,7 +2196,7 @@ pfmfs_delete_dentry(struct dentry *dentry) 
	return 1;

}



static struct dentry_operations pfmfs_dentry_operations = {

static const struct dentry_operations pfmfs_dentry_operations = {

	.d_delete = pfmfs_delete_dentry,

};

arch/mips/kernel/linux32.c

+0 −34
Original line number Diff line number Diff line
@@ -355,40 +355,6 @@ SYSCALL_DEFINE1(32_personality, unsigned long, personality) 
	return ret;

}



/* ustat compatibility */

struct ustat32 {

	compat_daddr_t	f_tfree;

	compat_ino_t	f_tinode;

	char		f_fname[6];

	char		f_fpack[6];

};



extern asmlinkage long sys_ustat(dev_t dev, struct ustat __user * ubuf);



SYSCALL_DEFINE2(32_ustat, dev_t, dev, struct ustat32 __user *, ubuf32)

{

	int err;

	struct ustat tmp;

	struct ustat32 tmp32;

	mm_segment_t old_fs = get_fs();



	set_fs(KERNEL_DS);

	err = sys_ustat(dev, (struct ustat __user *)&tmp);

	set_fs(old_fs);



	if (err)

		goto out;



	memset(&tmp32, 0, sizeof(struct ustat32));

	tmp32.f_tfree = tmp.f_tfree;

	tmp32.f_tinode = tmp.f_tinode;



	err = copy_to_user(ubuf32, &tmp32, sizeof(struct ustat32)) ? -EFAULT : 0;



out:

	return err;

}



SYSCALL_DEFINE4(32_sendfile, long, out_fd, long, in_fd,

	compat_off_t __user *, offset, s32, count)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE