luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: remove unused arg from ceph_lookup_open()

Browse Source 
What was the purpose of this?

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Miklos Szeredi 2012-06-05 15:10:24 +02:00 committed by Al Viro
parent d2c127197d
commit 3819219b59
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ceph/dir.c
View File

@ -599,7 +599,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
(nd->flags & LOOKUP_OPEN) && (nd->flags & LOOKUP_OPEN) &&
!(nd->intent.open.flags & O_CREAT)) { !(nd->intent.open.flags & O_CREAT)) {
int mode = nd->intent.open.create_mode & ~current->fs->umask; 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? */ /* can we conclude ENOENT locally? */
@ -710,7 +710,7 @@ static int ceph_create(struct inode *dir, struct dentry *dentry, umode_t mode,
if (nd) { if (nd) {
BUG_ON((nd->flags & LOOKUP_OPEN) == 0); 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? */ /* hrm, what should i do here if we get aliased? */
if (IS_ERR(dentry)) if (IS_ERR(dentry))
return PTR_ERR(dentry); return PTR_ERR(dentry);

3
fs/ceph/file.c
View File

@ -219,8 +219,7 @@ int ceph_open(struct inode *inode, struct file *file)
* path_lookup_create -> LOOKUP_OPEN|LOOKUP_CREATE * path_lookup_create -> LOOKUP_OPEN|LOOKUP_CREATE
*/ */
struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry, struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
struct nameidata *nd, int mode, struct nameidata *nd, int mode)
int locked_dir)
{ {
struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb); struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
struct ceph_mds_client *mdsc = fsc->mdsc; struct ceph_mds_client *mdsc = fsc->mdsc;

3
fs/ceph/super.h
View File

@ -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 struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
extern int ceph_open(struct inode *inode, struct file *file); extern int ceph_open(struct inode *inode, struct file *file);
extern struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry, extern struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
struct nameidata *nd, int mode, struct nameidata *nd, int mode);
int locked_dir);
extern int ceph_release(struct inode *inode, struct file *filp); extern int ceph_release(struct inode *inode, struct file *filp);
/* dir.c */ /* dir.c */