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

Commit 1eb80d6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull more vfs updates from Al Viro:
 "A couple of misc patches"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  afs dynroot: switch to simple_dir_operations
  fs/handle.c - fix up kerneldoc
parents 7edee522 473ef57a

fs/afs/dynroot.c

+0 −7
Original line number Diff line number Diff line
@@ -10,13 +10,6 @@ 
#include <linux/dns_resolver.h>

#include "internal.h"



const struct file_operations afs_dynroot_file_operations = {

	.open		= dcache_dir_open,

	.release	= dcache_dir_close,

	.iterate_shared	= dcache_readdir,

	.llseek		= dcache_dir_lseek,

};



/*

 * Probe to see if a cell may exist.  This prevents positive dentries from

 * being created unnecessarily.

fs/afs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ struct inode *afs_iget_pseudo_dir(struct super_block *sb, bool root) 
	inode->i_mode		= S_IFDIR | S_IRUGO | S_IXUGO;

	if (root) {

		inode->i_op	= &afs_dynroot_inode_operations;

		inode->i_fop	= &afs_dynroot_file_operations;

		inode->i_fop	= &simple_dir_operations;

	} else {

		inode->i_op	= &afs_autocell_inode_operations;

	}

fs/afs/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -910,7 +910,6 @@ extern int afs_silly_iput(struct dentry *, struct inode *); 
/*

 * dynroot.c

 */

extern const struct file_operations afs_dynroot_file_operations;

extern const struct inode_operations afs_dynroot_inode_operations;

extern const struct dentry_operations afs_dynroot_dentry_operations;

fs/fhandle.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static long do_handle_open(int mountdirfd, struct file_handle __user *ufh, 
 * sys_open_by_handle_at: Open the file handle

 * @mountdirfd: directory file descriptor

 * @handle: file handle to be opened

 * @flag: open flags.

 * @flags: open flags.

 *

 * @mountdirfd indicate the directory file descriptor

 * of the mount point. file handle is decoded relative