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

Commit 08d27eb2 authored Jul 12, 2016 by Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  posix_acl: de-union a_refcount and a_rcu
  nfs_atomic_open(): prevent parallel nfs_lookup() on a negative hashed
  Use the right predicate in ->atomic_open() instances

parents 92d21ac7 6d4e56ce

fs/9p/vfs_inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -853,7 +853,7 @@ v9fs_vfs_atomic_open(struct inode dir, struct dentry dentry,
		struct p9_fid fid, inode_fid;
		struct dentry *res = NULL;

		if (d_unhashed(dentry)) {
		if (d_in_lookup(dentry)) {
		res = v9fs_vfs_lookup(dir, dentry, 0);
		if (IS_ERR(res))
		return PTR_ERR(res);

fs/9p/vfs_inode_dotl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ v9fs_vfs_atomic_open_dotl(struct inode dir, struct dentry dentry,
		struct posix_acl pacl = NULL, dacl = NULL;
		struct dentry *res = NULL;

		if (d_unhashed(dentry)) {
		if (d_in_lookup(dentry)) {
		res = v9fs_vfs_lookup(dir, dentry, 0);
		if (IS_ERR(res))
		return PTR_ERR(res);

fs/ceph/file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -394,7 +394,7 @@ int ceph_atomic_open(struct inode dir, struct dentry dentry,
		if ((flags & O_CREAT) && !req->r_reply_info.head->is_dentry)
		err = ceph_handle_notrace_create(dir, dentry);

		if (d_unhashed(dentry)) {
		if (d_in_lookup(dentry)) {
		dn = ceph_finish_lookup(req, dentry, err);
		if (IS_ERR(dn))
		err = PTR_ERR(dn);

fs/cifs/dir.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -445,7 +445,7 @@ cifs_atomic_open(struct inode inode, struct dentry direntry,
		* Check for hashed negative dentry. We have already revalidated
		* the dentry and it is fine. No need to perform another lookup.
		*/
		if (!d_unhashed(direntry))
		if (!d_in_lookup(direntry))
		return -ENOENT;

		res = cifs_lookup(inode, direntry, 0);

fs/fuse/dir.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ static int fuse_atomic_open(struct inode dir, struct dentry entry,
		struct fuse_conn *fc = get_fuse_conn(dir);
		struct dentry *res = NULL;

		if (d_unhashed(entry)) {
		if (d_in_lookup(entry)) {
		res = fuse_lookup(dir, entry, 0);
		if (IS_ERR(res))
		return PTR_ERR(res);