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

Commit 603ba7e4 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 

Pull vfs pile #2 from Al Viro:
 "Next pile (and there'll be one or two more).

  The large piece in this one is getting rid of /proc/*/ns/* weirdness;
  among other things, it allows to (finally) make nameidata completely
  opaque outside of fs/namei.c, making for easier further cleanups in
  there"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  coda_venus_readdir(): use file_inode()
  fs/namei.c: fold link_path_walk() call into path_init()
  path_init(): don't bother with LOOKUP_PARENT in argument
  fs/namei.c: new helper (path_cleanup())
  path_init(): store the "base" pointer to file in nameidata itself
  make default ->i_fop have ->open() fail with ENXIO
  make nameidata completely opaque outside of fs/namei.c
  kill proc_ns completely
  take the targets of /proc/*/ns/* symlinks to separate fs
  bury struct proc_ns in fs/proc
  copy address of proc_ns_ops into ns_common
  new helpers: ns_alloc_inum/ns_free_inum
  make proc_ns_operations work with struct ns_common * instead of void *
  switch the rest of proc_ns_operations to working with &...->ns
  netns: switch ->get()/->put()/->install()/->inum() to working with &net->ns
  make mntns ->get()/->put()/->install()/->inum() work with &mnt_ns->ns
  common object embedded into various struct ....ns
parents 31f48fc8 93fe74b2

arch/ia64/kernel/perfmon.c

+0 −10
Original line number Diff line number Diff line
@@ -2145,22 +2145,12 @@ pfm_close(struct inode *inode, struct file *filp) 
	return 0;

}



static int

pfm_no_open(struct inode *irrelevant, struct file *dontcare)

{

	DPRINT(("pfm_no_open called\n"));

	return -ENXIO;

}







static const struct file_operations pfm_file_ops = {

	.llseek		= no_llseek,

	.read		= pfm_read,

	.write		= pfm_write,

	.poll		= pfm_poll,

	.unlocked_ioctl = pfm_ioctl,

	.open		= pfm_no_open,	/* special open code to disallow open via /proc */

	.fasync		= pfm_fasync,

	.release	= pfm_close,

	.flush		= pfm_flush

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 splice.o sync.o utimes.o \

		stack.o fs_struct.o statfs.o fs_pin.o

		stack.o fs_struct.o statfs.o fs_pin.o nsfs.o



ifeq ($(CONFIG_BLOCK),y)

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

fs/coda/dir.c

+1 −3
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ static int coda_venus_readdir(struct file *coda_file, struct dir_context *ctx) 
	struct coda_file_info *cfi;

	struct coda_inode_info *cii;

	struct file *host_file;

	struct dentry *de;

	struct venus_dirent *vdir;

	unsigned long vdir_size = offsetof(struct venus_dirent, d_name);

	unsigned int type;
@@ -438,8 +437,7 @@ static int coda_venus_readdir(struct file *coda_file, struct dir_context *ctx) 
	BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);

	host_file = cfi->cfi_container;



	de = coda_file->f_path.dentry;

	cii = ITOC(de->d_inode);

	cii = ITOC(file_inode(coda_file));



	vdir = kmalloc(sizeof(*vdir), GFP_KERNEL);

	if (!vdir) return -ENOMEM;

fs/inode.c

+8 −3
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ int proc_nr_inodes(struct ctl_table *table, int write, 
}

#endif



static int no_open(struct inode *inode, struct file *file)

{

	return -ENXIO;

}



/**

 * inode_init_always - perform inode structure intialisation

 * @sb: superblock inode belongs to
@@ -125,7 +130,7 @@ int proc_nr_inodes(struct ctl_table *table, int write, 
int inode_init_always(struct super_block *sb, struct inode *inode)

{

	static const struct inode_operations empty_iops;

	static const struct file_operations empty_fops;

	static const struct file_operations no_open_fops = {.open = no_open};

	struct address_space *const mapping = &inode->i_data;



	inode->i_sb = sb;
@@ -133,7 +138,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode) 
	inode->i_flags = 0;

	atomic_set(&inode->i_count, 1);

	inode->i_op = &empty_iops;

	inode->i_fop = &empty_fops;

	inode->i_fop = &no_open_fops;

	inode->__i_nlink = 1;

	inode->i_opflags = 0;

	i_uid_write(inode, 0);
@@ -1798,7 +1803,7 @@ void init_special_inode(struct inode *inode, umode_t mode, dev_t rdev) 
	} else if (S_ISFIFO(mode))

		inode->i_fop = &pipefifo_fops;

	else if (S_ISSOCK(mode))

		inode->i_fop = &bad_sock_fops;

		;	/* leave it no_open_fops */

	else

		printk(KERN_DEBUG "init_special_inode: bogus i_mode (%o) for"

				  " inode %s:%lu\n", mode, inode->i_sb->s_id,

fs/internal.h

+5 −0
Original line number Diff line number Diff line
@@ -147,3 +147,8 @@ extern const struct file_operations pipefifo_fops; 
 */

extern void sb_pin_kill(struct super_block *sb);

extern void mnt_pin_kill(struct mount *m);



/*

 * fs/nsfs.c

 */

extern struct dentry_operations ns_dentry_operations;