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

Commit e45198a6 authored by Al Viro's avatar Al Viro
Browse files

make finish_no_open() return int 



namely, 1 ;-)  That's what we want to return from ->atomic_open()
instances after finish_no_open().

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2675a4eb

fs/9p/vfs_inode.c

+2 −4
Original line number Diff line number Diff line
@@ -878,10 +878,8 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry, 
	}



	/* Only creates */

	if (!(flags & O_CREAT) || dentry->d_inode) {

		finish_no_open(file, res);

		return 1;

	}

	if (!(flags & O_CREAT) || dentry->d_inode)

		return finish_no_open(file, res);



	err = 0;

	fid = NULL;

fs/9p/vfs_inode_dotl.c

+2 −4
Original line number Diff line number Diff line
@@ -268,10 +268,8 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry, 
	}



	/* Only creates */

	if (!(flags & O_CREAT) || dentry->d_inode) {

		finish_no_open(file, res);

		return 1;

	}

	if (!(flags & O_CREAT) || dentry->d_inode)

		return finish_no_open(file, res);



	v9ses = v9fs_inode2v9ses(dir);

fs/ceph/dir.c

+2 −4
Original line number Diff line number Diff line
@@ -662,10 +662,8 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, 
	}



	/* We don't deal with positive dentries here */

	if (dentry->d_inode) {

		finish_no_open(file, res);

		return 1;

	}

	if (dentry->d_inode)

		return finish_no_open(file, res);



	*opened |= FILE_CREATED;

	err = ceph_lookup_open(dir, dentry, file, flags, mode, opened);

fs/cifs/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -405,8 +405,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, 
		if (IS_ERR(res))

			return PTR_ERR(res);



		finish_no_open(file, res);

		return 1;

		return finish_no_open(file, res);

	}



	rc = check_name(direntry);

fs/fuse/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -509,8 +509,7 @@ static int fuse_atomic_open(struct inode *dir, struct dentry *entry, 
	if (err)

		goto out_dput;

no_open:

	finish_no_open(file, res);

	return 1;

	return finish_no_open(file, res);

}



/*