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

Commit 4e82901c authored by Al Viro's avatar Al Viro
Browse files

dcache_{readdir,dir_lseek}() users: switch to ->iterate_shared 



no need to lock directory in dcache_dir_lseek(), while we are
at it - per-struct file exclusion is enough.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3125d265

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

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ const struct file_operations spufs_context_fops = { 
	.release	= spufs_dir_close,

	.llseek		= dcache_dir_lseek,

	.read		= generic_read_dir,

	.iterate	= dcache_readdir,

	.iterate_shared	= dcache_readdir,

	.fsync		= noop_fsync,

};

EXPORT_SYMBOL_GPL(spufs_context_fops);

fs/autofs4/root.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ const struct file_operations autofs4_root_operations = { 
	.open		= dcache_dir_open,

	.release	= dcache_dir_close,

	.read		= generic_read_dir,

	.iterate	= dcache_readdir,

	.iterate_shared	= dcache_readdir,

	.llseek		= dcache_dir_lseek,

	.unlocked_ioctl	= autofs4_root_ioctl,

#ifdef CONFIG_COMPAT
@@ -51,7 +51,7 @@ const struct file_operations autofs4_dir_operations = { 
	.open		= autofs4_dir_open,

	.release	= dcache_dir_close,

	.read		= generic_read_dir,

	.iterate	= dcache_readdir,

	.iterate_shared	= dcache_readdir,

	.llseek		= dcache_dir_lseek,

};

fs/libfs.c

+1 −4
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ EXPORT_SYMBOL(dcache_dir_close); 
loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)

{

	struct dentry *dentry = file->f_path.dentry;

	inode_lock(d_inode(dentry));

	switch (whence) {

		case 1:

			offset += file->f_pos;
@@ -97,7 +96,6 @@ loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence) 
			if (offset >= 0)

				break;

		default:

			inode_unlock(d_inode(dentry));

			return -EINVAL;

	}

	if (offset != file->f_pos) {
@@ -124,7 +122,6 @@ loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence) 
			spin_unlock(&dentry->d_lock);

		}

	}

	inode_unlock(d_inode(dentry));

	return offset;

}

EXPORT_SYMBOL(dcache_dir_lseek);
@@ -190,7 +187,7 @@ const struct file_operations simple_dir_operations = { 
	.release	= dcache_dir_close,

	.llseek		= dcache_dir_lseek,

	.read		= generic_read_dir,

	.iterate	= dcache_readdir,

	.iterate_shared	= dcache_readdir,

	.fsync		= noop_fsync,

};

EXPORT_SYMBOL(simple_dir_operations);