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

Commit 8ebbfb49 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 

Assorted fixes, sat in -next for a week or so...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ocfs2: deal with wraparounds of i_nlink in ocfs2_rename()
  vfs: fix compat_sys_stat() handling of overflows in st_nlink
  quota: Fix deadlock with suspend and quotas
  vfs: Provide function to get superblock and wait for it to thaw
  vfs: fix panic in __d_lookup() with high dentry hashtable counts
  autofs4 - fix lockdep splat in autofs
  vfs: fix d_inode_lookup() dentry ref leak
parents 39e255da 847c9db5

fs/autofs4/expire.c

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static struct dentry *get_next_positive_subdir(struct dentry *prev, 
	/* Negative dentry - try next */

	if (!simple_positive(q)) {

		spin_unlock(&p->d_lock);

		lock_set_subclass(&q->d_lock.dep_map, 0, _RET_IP_);

		p = q;

		goto again;

	}
@@ -186,6 +187,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev, 
	/* Negative dentry - try next */

	if (!simple_positive(ret)) {

		spin_unlock(&p->d_lock);

		lock_set_subclass(&ret->d_lock.dep_map, 0, _RET_IP_);

		p = ret;

		goto again;

	}

fs/compat.c

+25 −31
Original line number Diff line number Diff line
@@ -131,41 +131,35 @@ asmlinkage long compat_sys_utimes(const char __user *filename, struct compat_tim 


static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)

{

	compat_ino_t ino = stat->ino;

	typeof(ubuf->st_uid) uid = 0;

	typeof(ubuf->st_gid) gid = 0;

	int err;

	struct compat_stat tmp;



	SET_UID(uid, stat->uid);

	SET_GID(gid, stat->gid);

	if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev))

		return -EOVERFLOW;



	if ((u64) stat->size > MAX_NON_LFS ||

	    !old_valid_dev(stat->dev) ||

	    !old_valid_dev(stat->rdev))

	memset(&tmp, 0, sizeof(tmp));

	tmp.st_dev = old_encode_dev(stat->dev);

	tmp.st_ino = stat->ino;

	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)

		return -EOVERFLOW;

	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)

	tmp.st_mode = stat->mode;

	tmp.st_nlink = stat->nlink;

	if (tmp.st_nlink != stat->nlink)

		return -EOVERFLOW;



	if (clear_user(ubuf, sizeof(*ubuf)))

		return -EFAULT;



	err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);

	err |= __put_user(ino, &ubuf->st_ino);

	err |= __put_user(stat->mode, &ubuf->st_mode);

	err |= __put_user(stat->nlink, &ubuf->st_nlink);

	err |= __put_user(uid, &ubuf->st_uid);

	err |= __put_user(gid, &ubuf->st_gid);

	err |= __put_user(old_encode_dev(stat->rdev), &ubuf->st_rdev);

	err |= __put_user(stat->size, &ubuf->st_size);

	err |= __put_user(stat->atime.tv_sec, &ubuf->st_atime);

	err |= __put_user(stat->atime.tv_nsec, &ubuf->st_atime_nsec);

	err |= __put_user(stat->mtime.tv_sec, &ubuf->st_mtime);

	err |= __put_user(stat->mtime.tv_nsec, &ubuf->st_mtime_nsec);

	err |= __put_user(stat->ctime.tv_sec, &ubuf->st_ctime);

	err |= __put_user(stat->ctime.tv_nsec, &ubuf->st_ctime_nsec);

	err |= __put_user(stat->blksize, &ubuf->st_blksize);

	err |= __put_user(stat->blocks, &ubuf->st_blocks);

	return err;

	SET_UID(tmp.st_uid, stat->uid);

	SET_GID(tmp.st_gid, stat->gid);

	tmp.st_rdev = old_encode_dev(stat->rdev);

	if ((u64) stat->size > MAX_NON_LFS)

		return -EOVERFLOW;

	tmp.st_size = stat->size;

	tmp.st_atime = stat->atime.tv_sec;

	tmp.st_atime_nsec = stat->atime.tv_nsec;

	tmp.st_mtime = stat->mtime.tv_sec;

	tmp.st_mtime_nsec = stat->mtime.tv_nsec;

	tmp.st_ctime = stat->ctime.tv_sec;

	tmp.st_ctime_nsec = stat->ctime.tv_nsec;

	tmp.st_blocks = stat->blocks;

	tmp.st_blksize = stat->blksize;

	return copy_to_user(ubuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;

}



asmlinkage long compat_sys_newstat(const char __user * filename,

fs/dcache.c

+4 −4
Original line number Diff line number Diff line
@@ -2968,7 +2968,7 @@ __setup("dhash_entries=", set_dhash_entries); 


static void __init dcache_init_early(void)

{

	int loop;

	unsigned int loop;



	/* If hashes are distributed across NUMA nodes, defer

	 * hash allocation until vmalloc space is available.
@@ -2986,13 +2986,13 @@ static void __init dcache_init_early(void) 
					&d_hash_mask,

					0);



	for (loop = 0; loop < (1 << d_hash_shift); loop++)

	for (loop = 0; loop < (1U << d_hash_shift); loop++)

		INIT_HLIST_BL_HEAD(dentry_hashtable + loop);

}



static void __init dcache_init(void)

{

	int loop;

	unsigned int loop;



	/* 

	 * A constructor could be added for stable state like the lists,
@@ -3016,7 +3016,7 @@ static void __init dcache_init(void) 
					&d_hash_mask,

					0);



	for (loop = 0; loop < (1 << d_hash_shift); loop++)

	for (loop = 0; loop < (1U << d_hash_shift); loop++)

		INIT_HLIST_BL_HEAD(dentry_hashtable + loop);

}

fs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1651,7 +1651,7 @@ __setup("ihash_entries=", set_ihash_entries); 
 */

void __init inode_init_early(void)

{

	int loop;

	unsigned int loop;



	/* If hashes are distributed across NUMA nodes, defer

	 * hash allocation until vmalloc space is available.
@@ -1669,13 +1669,13 @@ void __init inode_init_early(void) 
					&i_hash_mask,

					0);



	for (loop = 0; loop < (1 << i_hash_shift); loop++)

	for (loop = 0; loop < (1U << i_hash_shift); loop++)

		INIT_HLIST_HEAD(&inode_hashtable[loop]);

}



void __init inode_init(void)

{

	int loop;

	unsigned int loop;



	/* inode slab cache */

	inode_cachep = kmem_cache_create("inode_cache",
@@ -1699,7 +1699,7 @@ void __init inode_init(void) 
					&i_hash_mask,

					0);



	for (loop = 0; loop < (1 << i_hash_shift); loop++)

	for (loop = 0; loop < (1U << i_hash_shift); loop++)

		INIT_HLIST_HEAD(&inode_hashtable[loop]);

}

fs/namei.c

+3 −1
Original line number Diff line number Diff line
@@ -1095,8 +1095,10 @@ static struct dentry *d_inode_lookup(struct dentry *parent, struct dentry *dentr 
	struct dentry *old;



	/* Don't create child dentry for a dead directory. */

	if (unlikely(IS_DEADDIR(inode)))

	if (unlikely(IS_DEADDIR(inode))) {

		dput(dentry);

		return ERR_PTR(-ENOENT);

	}



	old = inode->i_op->lookup(inode, dentry, nd);

	if (unlikely(old)) {