Merge branch 'work.misc' into work.lookup (837f3ec6) · Commits · 戴 / test

fs/dcache.c

+34 −49

Original line number	Diff line number	Diff line
		@@ -907,6 +907,35 @@ repeat:
		}
		EXPORT_SYMBOL(dget_parent);

		static struct dentry * __d_find_any_alias(struct inode *inode)
		{
		struct dentry *alias;

		if (hlist_empty(&inode->i_dentry))
		return NULL;
		alias = hlist_entry(inode->i_dentry.first, struct dentry, d_u.d_alias);
		__dget(alias);
		return alias;
		}

		/**
		* d_find_any_alias - find any alias for a given inode
		* @inode: inode to find an alias for
		*
		* If any aliases exist for the given inode, take and return a
		* reference for one of them. If no aliases exist, return %NULL.
		*/
		struct dentry d_find_any_alias(struct inode inode)
		{
		struct dentry *de;

		spin_lock(&inode->i_lock);
		de = __d_find_any_alias(inode);
		spin_unlock(&inode->i_lock);
		return de;
		}
		EXPORT_SYMBOL(d_find_any_alias);

		/**
		* d_find_alias - grab a hashed alias of inode
		* @inode: inode in question
		@@ -923,34 +952,19 @@ EXPORT_SYMBOL(dget_parent);
		*/
		static struct dentry __d_find_alias(struct inode inode)
		{
		struct dentry alias, discon_alias;
		struct dentry *alias;

		if (S_ISDIR(inode->i_mode))
		return __d_find_any_alias(inode);

		again:
		discon_alias = NULL;
		hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) {
		spin_lock(&alias->d_lock);
		if (S_ISDIR(inode->i_mode) \|\| !d_unhashed(alias)) {
		if (IS_ROOT(alias) &&
		(alias->d_flags & DCACHE_DISCONNECTED)) {
		discon_alias = alias;
		} else {
		__dget_dlock(alias);
		spin_unlock(&alias->d_lock);
		return alias;
		}
		}
		spin_unlock(&alias->d_lock);
		}
		if (discon_alias) {
		alias = discon_alias;
		spin_lock(&alias->d_lock);
		if (S_ISDIR(inode->i_mode) \|\| !d_unhashed(alias)) {
		if (!d_unhashed(alias)) {
		__dget_dlock(alias);
		spin_unlock(&alias->d_lock);
		return alias;
		}
		spin_unlock(&alias->d_lock);
		goto again;
		}
		return NULL;
		}
		@@ -1963,35 +1977,6 @@ struct dentry d_make_root(struct inode root_inode)
		}
		EXPORT_SYMBOL(d_make_root);

		static struct dentry * __d_find_any_alias(struct inode *inode)
		{
		struct dentry *alias;

		if (hlist_empty(&inode->i_dentry))
		return NULL;
		alias = hlist_entry(inode->i_dentry.first, struct dentry, d_u.d_alias);
		__dget(alias);
		return alias;
		}

		/**
		* d_find_any_alias - find any alias for a given inode
		* @inode: inode to find an alias for
		*
		* If any aliases exist for the given inode, take and return a
		* reference for one of them. If no aliases exist, return %NULL.
		*/
		struct dentry d_find_any_alias(struct inode inode)
		{
		struct dentry *de;

		spin_lock(&inode->i_lock);
		de = __d_find_any_alias(inode);
		spin_unlock(&inode->i_lock);
		return de;
		}
		EXPORT_SYMBOL(d_find_any_alias);

		static struct dentry __d_instantiate_anon(struct dentry dentry,
		struct inode *inode,
		bool disconnected)

fs/fat/namei_msdos.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -314,10 +314,6 @@ static int msdos_rmdir(struct inode dir, struct dentry dentry)
		int err;

		mutex_lock(&MSDOS_SB(sb)->s_lock);
		/*
		* Check whether the directory is not in use, then check
		* whether it is empty.
		*/
		err = fat_dir_empty(inode);
		if (err)
		goto out;

fs/fat/namei_vfat.c

+1 −12

Original line number	Diff line number	Diff line
		@@ -697,15 +697,6 @@ static int vfat_find(struct inode dir, const struct qstr qname,
		return fat_search_long(dir, qname->name, len, sinfo);
		}

		/*
		* (nfsd's) anonymous disconnected dentry?
		* NOTE: !IS_ROOT() is not anonymous (I.e. d_splice_alias() did the job).
		*/
		static int vfat_d_anon_disconn(struct dentry *dentry)
		{
		return IS_ROOT(dentry) && (dentry->d_flags & DCACHE_DISCONNECTED);
		}

		static struct dentry vfat_lookup(struct inode dir, struct dentry *dentry,
		unsigned int flags)
		{
		@@ -738,8 +729,7 @@ static struct dentry vfat_lookup(struct inode dir, struct dentry *dentry,
		* Checking "alias->d_parent == dentry->d_parent" to make sure
		* FS is not corrupted (especially double linked dir).
		*/
		if (alias && alias->d_parent == dentry->d_parent &&
		!vfat_d_anon_disconn(alias)) {
		if (alias && alias->d_parent == dentry->d_parent) {
		/*
		* This inode has non anonymous-DCACHE_DISCONNECTED
		* dentry. This means, the user did ->lookup() by an
		@@ -747,7 +737,6 @@ static struct dentry vfat_lookup(struct inode dir, struct dentry *dentry,
		*
		* Switch to new one for reason of locality if possible.
		*/
		BUG_ON(d_unhashed(alias));
		if (!S_ISDIR(inode->i_mode))
		d_move(alias, dentry);
		iput(inode);

fs/namei.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1438,10 +1438,8 @@ static int path_parent_directory(struct path *path)
		static int follow_dotdot(struct nameidata *nd)
		{
		while(1) {
		if (nd->path.dentry == nd->root.dentry &&
		nd->path.mnt == nd->root.mnt) {
		if (path_equal(&nd->path, &nd->root))
		break;
		}
		if (nd->path.dentry != nd->path.mnt->mnt_root) {
		int ret = path_parent_directory(&nd->path);
		if (ret)

fs/read_write.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2023,7 +2023,7 @@ int vfs_dedupe_file_range(struct file file, struct file_dedupe_range same)
		ret = mnt_want_write_file(dst_file);
		if (ret) {
		info->status = ret;
		goto next_loop;
		goto next_fdput;
		}

		dst_off = info->dest_offset;
		@@ -2058,9 +2058,9 @@ int vfs_dedupe_file_range(struct file file, struct file_dedupe_range same)

		next_file:
		mnt_drop_write_file(dst_file);
		next_loop:
		next_fdput:
		fdput(dst_fd);

		next_loop:
		if (fatal_signal_pending(current))
		goto out;
		}

Admin message