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

Commit 3819219b authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

ceph: remove unused arg from ceph_lookup_open() 



What was the purpose of this?

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
CC: Sage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d2c12719

fs/ceph/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry, 
	    (nd->flags & LOOKUP_OPEN) &&

	    !(nd->intent.open.flags & O_CREAT)) {

		int mode = nd->intent.open.create_mode & ~current->fs->umask;

		return ceph_lookup_open(dir, dentry, nd, mode, 1);

		return ceph_lookup_open(dir, dentry, nd, mode);

	}



	/* can we conclude ENOENT locally? */
@@ -710,7 +710,7 @@ static int ceph_create(struct inode *dir, struct dentry *dentry, umode_t mode, 


	if (nd) {

		BUG_ON((nd->flags & LOOKUP_OPEN) == 0);

		dentry = ceph_lookup_open(dir, dentry, nd, mode, 0);

		dentry = ceph_lookup_open(dir, dentry, nd, mode);

		/* hrm, what should i do here if we get aliased? */

		if (IS_ERR(dentry))

			return PTR_ERR(dentry);

fs/ceph/file.c

+1 −2
Original line number Diff line number Diff line
@@ -219,8 +219,7 @@ int ceph_open(struct inode *inode, struct file *file) 
 *  path_lookup_create -> LOOKUP_OPEN|LOOKUP_CREATE

 */

struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,

				struct nameidata *nd, int mode,

				int locked_dir)

				struct nameidata *nd, int mode)

{

	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

fs/ceph/super.h

+1 −2
Original line number Diff line number Diff line
@@ -807,8 +807,7 @@ extern int ceph_copy_from_page_vector(struct page **pages, 
extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);

extern int ceph_open(struct inode *inode, struct file *file);

extern struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,

				       struct nameidata *nd, int mode,

				       int locked_dir);

				       struct nameidata *nd, int mode);

extern int ceph_release(struct inode *inode, struct file *filp);



/* dir.c */