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

Commit 520c8534 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:
  inotify: fix type errors in interfaces
  fix breakage in reiserfs_new_inode()
  fix the treatment of jfs special inodes
  vfs: remove duplicate code in get_fs_type()
  add a vfs_fsync helper
  sys_execve and sys_uselib do not call into fsnotify
  zero i_uid/i_gid on inode allocation
  inode->i_op is never NULL
  ntfs: don't NULL i_op
  isofs check for NULL ->i_op in root directory is dead code
  affs: do not zero ->i_op
  kill suid bit only for regular files
  vfs: lseek(fd, 0, SEEK_CUR) race condition
parents e8c82c2e 4ae8978c

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

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ spufs_new_inode(struct super_block *sb, int mode) 
	inode->i_mode = mode;

	inode->i_uid = current_fsuid();

	inode->i_gid = current_fsgid();

	inode->i_blocks = 0;

	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

out:

	return inode;

arch/s390/hypfs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) 
		ret->i_mode = mode;

		ret->i_uid = hypfs_info->uid;

		ret->i_gid = hypfs_info->gid;

		ret->i_blocks = 0;

		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;

		if (mode & S_IFDIR)

			ret->i_nlink = 2;

drivers/infiniband/hw/ipath/ipath_fs.c

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry, 
	}



	inode->i_mode = mode;

	inode->i_uid = 0;

	inode->i_gid = 0;

	inode->i_blocks = 0;

	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

	inode->i_private = data;

	if ((mode & S_IFMT) == S_IFDIR) {

drivers/isdn/capi/capifs.c

+0 −2
Original line number Diff line number Diff line
@@ -111,8 +111,6 @@ capifs_fill_super(struct super_block *s, void *data, int silent) 
		goto fail;

	inode->i_ino = 1;

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;

	inode->i_blocks = 0;

	inode->i_uid = inode->i_gid = 0;

	inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;

	inode->i_op = &simple_dir_inode_operations;

	inode->i_fop = &simple_dir_operations;

drivers/misc/ibmasm/ibmasmfs.c

+0 −2
Original line number Diff line number Diff line
@@ -146,8 +146,6 @@ static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode) 


	if (ret) {

		ret->i_mode = mode;

		ret->i_uid = ret->i_gid = 0;

		ret->i_blocks = 0;

		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;

	}

	return ret;