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

Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc filesystem updates from Al Viro:
 "Misc cleanups (the part that hadn't been picked by individual fs
  trees)"

* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  apparmorfs: don't duplicate kfree_link()
  orangefs: saner arguments passing in readdir guts
  ocfs2_find_match(): there's no such thing as NULL or negative ->d_parent
  reiserfs_add_entry(): get rid of pointless namelen checks
  __ocfs2_add_entry(), ocfs2_prepare_dir_for_insert(): namelen checks
  ext4_add_entry(): ->d_name.len is never 0
  befs: d_obtain_alias(ERR_PTR(...)) will do the right thing
  affs: d_obtain_alias(ERR_PTR(...)) will do the right thing
  /proc/sys: use d_splice_alias() calling conventions to simplify failure exits
  hostfs: use d_splice_alias() calling conventions to simplify failure exits
  udf_fiiter_add_entry(): check for zero ->d_name.len is bogus...
  udf: d_obtain_alias(ERR_PTR(...)) will do the right thing...
  udf: d_splice_alias() will do the right thing on ERR_PTR() inode
  nfsd: kill stale comment about simple_fill_super() requirements
  bfs_add_entry(): get rid of pointless ->d_name.len checks
  nilfs2: d_obtain_alias(ERR_PTR(...)) will do the right thing...
  zonefs: d_splice_alias() will do the right thing on ERR_PTR() inode
parents 499aa1ca c5f3fd21

fs/affs/namei.c

+0 −3
Original line number Diff line number Diff line
@@ -532,9 +532,6 @@ static struct dentry *affs_get_parent(struct dentry *child) 
	parent = affs_iget(child->d_sb,

			   be32_to_cpu(AFFS_TAIL(child->d_sb, bh)->parent));

	brelse(bh);

	if (IS_ERR(parent))

		return ERR_CAST(parent);



	return d_obtain_alias(parent);

}

fs/befs/linuxvfs.c

+0 −3
Original line number Diff line number Diff line
@@ -671,9 +671,6 @@ static struct dentry *befs_get_parent(struct dentry *child) 


	parent = befs_iget(child->d_sb,

			   (unsigned long)befs_ino->i_parent.start);

	if (IS_ERR(parent))

		return ERR_CAST(parent);



	return d_obtain_alias(parent);

}

fs/bfs/dir.c

+0 −5
Original line number Diff line number Diff line
@@ -275,11 +275,6 @@ static int bfs_add_entry(struct inode *dir, const struct qstr *child, int ino) 


	dprintf("name=%s, namelen=%d\n", name, namelen);



	if (!namelen)

		return -ENOENT;

	if (namelen > BFS_NAMELEN)

		return -ENAMETOOLONG;



	sblock = BFS_I(dir)->i_sblock;

	eblock = BFS_I(dir)->i_eblock;

	for (block = sblock; block <= eblock; block++) {

fs/ext4/namei.c

+0 −2
Original line number Diff line number Diff line
@@ -2388,8 +2388,6 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry, 


	sb = dir->i_sb;

	blocksize = sb->s_blocksize;

	if (!dentry->d_name.len)

		return -EINVAL;



	if (fscrypt_is_nokey_name(dentry))

		return -ENOKEY;

fs/hostfs/hostfs_kern.c

+2 −6
Original line number Diff line number Diff line
@@ -637,12 +637,8 @@ static struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry, 


	inode = hostfs_iget(ino->i_sb, name);

	__putname(name);

	if (IS_ERR(inode)) {

		if (PTR_ERR(inode) == -ENOENT)

	if (inode == ERR_PTR(-ENOENT))

		inode = NULL;

		else

			return ERR_CAST(inode);

	}



	return d_splice_alias(inode, dentry);

}