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

Commit b8d4c1f9 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 misc filesystem updates from Al Viro:
 "Assorted normal VFS / filesystems stuff..."

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  dentry name snapshots
  Make statfs properly return read-only state after emergency remount
  fs/dcache: init in_lookup_hashtable
  minix: Deinline get_block, save 2691 bytes
  fs: Reorder inode_owner_or_capable() to avoid needless
  fs: warn in case userspace lied about modprobe return
parents 090a81d8 49d31c2f

fs/dcache.c

+32 −0
Original line number Diff line number Diff line
@@ -277,6 +277,33 @@ static inline int dname_external(const struct dentry *dentry) 
	return dentry->d_name.name != dentry->d_iname;

}



void take_dentry_name_snapshot(struct name_snapshot *name, struct dentry *dentry)

{

	spin_lock(&dentry->d_lock);

	if (unlikely(dname_external(dentry))) {

		struct external_name *p = external_name(dentry);

		atomic_inc(&p->u.count);

		spin_unlock(&dentry->d_lock);

		name->name = p->name;

	} else {

		memcpy(name->inline_name, dentry->d_iname, DNAME_INLINE_LEN);

		spin_unlock(&dentry->d_lock);

		name->name = name->inline_name;

	}

}

EXPORT_SYMBOL(take_dentry_name_snapshot);



void release_dentry_name_snapshot(struct name_snapshot *name)

{

	if (unlikely(name->name != name->inline_name)) {

		struct external_name *p;

		p = container_of(name->name, struct external_name, name[0]);

		if (unlikely(atomic_dec_and_test(&p->u.count)))

			kfree_rcu(p, u.head);

	}

}

EXPORT_SYMBOL(release_dentry_name_snapshot);



static inline void __d_set_inode_and_type(struct dentry *dentry,

					  struct inode *inode,

					  unsigned type_flags)
@@ -3598,6 +3625,11 @@ EXPORT_SYMBOL(d_genocide); 


void __init vfs_caches_init_early(void)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(in_lookup_hashtable); i++)

		INIT_HLIST_BL_HEAD(&in_lookup_hashtable[i]);



	dcache_init_early();

	inode_init_early();

}

fs/debugfs/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, 
{

	int error;

	struct dentry *dentry = NULL, *trap;

	const char *old_name;

	struct name_snapshot old_name;



	trap = lock_rename(new_dir, old_dir);

	/* Source or destination directories don't exist? */
@@ -781,19 +781,19 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, 
	if (IS_ERR(dentry) || dentry == trap || d_really_is_positive(dentry))

		goto exit;



	old_name = fsnotify_oldname_init(old_dentry->d_name.name);

	take_dentry_name_snapshot(&old_name, old_dentry);



	error = simple_rename(d_inode(old_dir), old_dentry, d_inode(new_dir),

			      dentry, 0);

	if (error) {

		fsnotify_oldname_free(old_name);

		release_dentry_name_snapshot(&old_name);

		goto exit;

	}

	d_move(old_dentry, dentry);

	fsnotify_move(d_inode(old_dir), d_inode(new_dir), old_name,

	fsnotify_move(d_inode(old_dir), d_inode(new_dir), old_name.name,

		d_is_dir(old_dentry),

		NULL, old_dentry);

	fsnotify_oldname_free(old_name);

	release_dentry_name_snapshot(&old_name);

	unlock_rename(new_dir, old_dir);

	dput(dentry);

	return old_dentry;

fs/filesystems.c

+3 −1
Original line number Diff line number Diff line
@@ -275,8 +275,10 @@ struct file_system_type *get_fs_type(const char *name) 
	int len = dot ? dot - name : strlen(name);



	fs = __get_fs_type(name, len);

	if (!fs && (request_module("fs-%.*s", len, name) == 0))

	if (!fs && (request_module("fs-%.*s", len, name) == 0)) {

		fs = __get_fs_type(name, len);

		WARN_ONCE(!fs, "request_module fs-%.*s succeeded, but still no fs?\n", len, name);

	}



	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {

		put_filesystem(fs);

fs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2014,7 +2014,7 @@ bool inode_owner_or_capable(const struct inode *inode) 
		return true;



	ns = current_user_ns();

	if (ns_capable(ns, CAP_FOWNER) && kuid_has_mapping(ns, inode->i_uid))

	if (kuid_has_mapping(ns, inode->i_uid) && ns_capable(ns, CAP_FOWNER))

		return true;

	return false;

}

fs/minix/itree_common.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static inline int splice_branch(struct inode *inode, 
	return -EAGAIN;

}



static inline int get_block(struct inode * inode, sector_t block,

static int get_block(struct inode * inode, sector_t block,

			struct buffer_head *bh, int create)

{

	int err = -EIO;