Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (12b9fa6a) · Commits · 戴 / test

fs/hpfs/namei.c

+3 −28

Original line number	Diff line number	Diff line
		@@ -376,12 +376,11 @@ static int hpfs_unlink(struct inode dir, struct dentry dentry)
		struct inode *inode = d_inode(dentry);
		dnode_secno dno;
		int r;
		int rep = 0;
		int err;

		hpfs_lock(dir->i_sb);
		hpfs_adjust_length(name, &len);
		again:

		err = -ENOENT;
		de = map_dirent(dir, hpfs_i(dir)->i_dno, name, len, &dno, &qbh);
		if (!de)
		@@ -401,33 +400,9 @@ again:
		hpfs_error(dir->i_sb, "there was error when removing dirent");
		err = -EFSERROR;
		break;
		case 2: /* no space for deleting, try to truncate file */

		case 2: /* no space for deleting */
		err = -ENOSPC;
		if (rep++)
		break;

		dentry_unhash(dentry);
		if (!d_unhashed(dentry)) {
		hpfs_unlock(dir->i_sb);
		return -ENOSPC;
		}
		if (generic_permission(inode, MAY_WRITE) \|\|
		!S_ISREG(inode->i_mode) \|\|
		get_write_access(inode)) {
		d_rehash(dentry);
		} else {
		struct iattr newattrs;
		/pr_info("truncating file before delete.\n");/
		newattrs.ia_size = 0;
		newattrs.ia_valid = ATTR_SIZE \| ATTR_CTIME;
		err = notify_change(dentry, &newattrs, NULL);
		put_write_access(inode);
		if (!err)
		goto again;
		}
		hpfs_unlock(dir->i_sb);
		return -ENOSPC;
		default:
		drop_nlink(inode);
		err = 0;

fs/namei.c

+15 −7

Original line number	Diff line number	Diff line
		@@ -1712,6 +1712,11 @@ static inline int should_follow_link(struct nameidata nd, struct path link,
		return 0;
		if (!follow)
		return 0;
		/* make sure that d_is_symlink above matches inode */
		if (nd->flags & LOOKUP_RCU) {
		if (read_seqcount_retry(&link->dentry->d_seq, seq))
		return -ECHILD;
		}
		return pick_link(nd, link, inode, seq);
		}

		@@ -1743,11 +1748,11 @@ static int walk_component(struct nameidata *nd, int flags)
		if (err < 0)
		return err;

		inode = d_backing_inode(path.dentry);
		seq = 0; /* we are already out of RCU mode */
		err = -ENOENT;
		if (d_is_negative(path.dentry))
		goto out_path_put;
		inode = d_backing_inode(path.dentry);
		}

		if (flags & WALK_PUT)
		@@ -3192,12 +3197,12 @@ retry_lookup:
		return error;

		BUG_ON(nd->flags & LOOKUP_RCU);
		inode = d_backing_inode(path.dentry);
		seq = 0; /* out of RCU mode, so the value doesn't matter */
		if (unlikely(d_is_negative(path.dentry))) {
		path_to_nameidata(&path, nd);
		return -ENOENT;
		}
		inode = d_backing_inode(path.dentry);
		finish_lookup:
		if (nd->depth)
		put_link(nd);
		@@ -3206,11 +3211,6 @@ finish_lookup:
		if (unlikely(error))
		return error;

		if (unlikely(d_is_symlink(path.dentry)) && !(open_flag & O_PATH)) {
		path_to_nameidata(&path, nd);
		return -ELOOP;
		}

		if ((nd->flags & LOOKUP_RCU) \|\| nd->path.mnt != path.mnt) {
		path_to_nameidata(&path, nd);
		} else {
		@@ -3229,6 +3229,10 @@ finish_open:
		return error;
		}
		audit_inode(nd->name, nd->path.dentry, 0);
		if (unlikely(d_is_symlink(nd->path.dentry)) && !(open_flag & O_PATH)) {
		error = -ELOOP;
		goto out;
		}
		error = -EISDIR;
		if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
		goto out;
		@@ -3273,6 +3277,10 @@ opened:
		goto exit_fput;
		}
		out:
		if (unlikely(error > 0)) {
		WARN_ON(1);
		error = -EINVAL;
		}
		if (got_write)
		mnt_drop_write(nd->path.mnt);
		path_put(&save_parent);

fs/read_write.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1533,10 +1533,12 @@ int vfs_clone_file_range(struct file *file_in, loff_t pos_in,

		if (!(file_in->f_mode & FMODE_READ) \|\|
		!(file_out->f_mode & FMODE_WRITE) \|\|
		(file_out->f_flags & O_APPEND) \|\|
		!file_in->f_op->clone_file_range)
		(file_out->f_flags & O_APPEND))
		return -EBADF;

		if (!file_in->f_op->clone_file_range)
		return -EOPNOTSUPP;

		ret = clone_verify_area(file_in, pos_in, len, false);
		if (ret)
		return ret;

Admin message