From: Dave Hansen Replace all callers with open_namei() directly, and move the nameidata stack allocation into open_namei(). Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton --- drivers/usb/gadget/file_storage.c | 5 + fs/exec.c | 2 fs/namei.c | 71 ++++++++++++++-------------- fs/nfsctl.c | 5 + fs/open.c | 6 -- fs/reiserfs/journal.c | 2 include/linux/fs.h | 3 - kernel/acct.c | 2 mm/swapfile.c | 4 - sound/sound_firmware.c | 2 10 files changed, 53 insertions(+), 49 deletions(-) diff -puN drivers/usb/gadget/file_storage.c~kill-filp_open drivers/usb/gadget/file_storage.c --- a/drivers/usb/gadget/file_storage.c~kill-filp_open +++ a/drivers/usb/gadget/file_storage.c @@ -3468,16 +3468,17 @@ static int open_backing_file(struct lun struct inode *inode = NULL; loff_t size; loff_t num_sectors; + int mode = O_LARGEFILE; /* R/W if we can, R/O if we must */ ro = curlun->ro; if (!ro) { - filp = filp_open(filename, O_RDWR | O_LARGEFILE, 0); + filp = open_namei(AT_FDCWD, filename, O_RDWR | mode, 0); if (-EROFS == PTR_ERR(filp)) ro = 1; } if (ro) - filp = filp_open(filename, O_RDONLY | O_LARGEFILE, 0); + filp = open_namei(AT_FDCWD, filename, O_RDONLY | mode, 0); if (IS_ERR(filp)) { LINFO(curlun, "unable to open backing file: %s\n", filename); return PTR_ERR(filp); diff -puN fs/exec.c~kill-filp_open fs/exec.c --- a/fs/exec.c~kill-filp_open +++ a/fs/exec.c @@ -1763,7 +1763,7 @@ int do_coredump(long signr, int exit_cod goto fail_unlock; } } else - file = filp_open(corename, + file = open_namei(AT_FDCWD, corename, O_CREAT | 2 | O_NOFOLLOW | O_LARGEFILE | flag, 0600); if (IS_ERR(file)) diff -puN fs/namei.c~kill-filp_open fs/namei.c --- a/fs/namei.c~kill-filp_open +++ a/fs/namei.c @@ -1731,9 +1731,10 @@ static inline int sys_open_flags_to_name * system call. See sys_open_flags_to_namei_flags(). * SMP-safe */ -struct file *open_namei(int dfd, const char *pathname, int sys_open_flag, - int mode, struct nameidata *nd) +struct file *open_pathname(int dfd, const char *pathname, + int sys_open_flag, int mode) { + struct nameidata nd; int acc_mode, error; struct path path; struct dentry *dir; @@ -1756,7 +1757,7 @@ struct file *open_namei(int dfd, const c */ if (!(flag & O_CREAT)) { error = path_lookup_open(dfd, pathname, lookup_flags(flag), - nd, flag); + &nd, flag); if (error) return ERR_PTR(error); goto ok; @@ -1765,7 +1766,7 @@ struct file *open_namei(int dfd, const c /* * Create - we need to know the parent. */ - error = path_lookup_create(dfd,pathname,LOOKUP_PARENT,nd,flag,mode); + error = path_lookup_create(dfd,pathname,LOOKUP_PARENT,&nd,flag,mode); if (error) return ERR_PTR(error); @@ -1775,14 +1776,14 @@ struct file *open_namei(int dfd, const c * will not do. */ error = -EISDIR; - if (nd->last_type != LAST_NORM || nd->last.name[nd->last.len]) + if (nd.last_type != LAST_NORM || nd.last.name[nd.last.len]) goto exit; - dir = nd->dentry; - nd->flags &= ~LOOKUP_PARENT; + dir = nd.dentry; + nd.flags &= ~LOOKUP_PARENT; mutex_lock(&dir->d_inode->i_mutex); - path.dentry = lookup_hash(nd); - path.mnt = nd->mnt; + path.dentry = lookup_hash(&nd); + path.mnt = nd.mnt; do_last: error = PTR_ERR(path.dentry); @@ -1791,18 +1792,18 @@ do_last: goto exit; } - if (IS_ERR(nd->intent.open.file)) { + if (IS_ERR(nd.intent.open.file)) { mutex_unlock(&dir->d_inode->i_mutex); - error = PTR_ERR(nd->intent.open.file); + error = PTR_ERR(nd.intent.open.file); goto exit_dput; } /* Negative dentry, just create the file */ if (!path.dentry->d_inode) { - error = __open_namei_create(nd, &path, flag, mode); + error = __open_namei_create(&nd, &path, flag, mode); if (error) goto exit; - return nameidata_to_filp(nd, sys_open_flag); + return nameidata_to_filp(&nd, sys_open_flag); } /* @@ -1827,22 +1828,22 @@ do_last: if (path.dentry->d_inode->i_op && path.dentry->d_inode->i_op->follow_link) goto do_link; - path_to_nameidata(&path, nd); + path_to_nameidata(&path, &nd); error = -EISDIR; if (path.dentry->d_inode && S_ISDIR(path.dentry->d_inode->i_mode)) goto exit; ok: - error = may_open(nd, acc_mode, flag); + error = may_open(&nd, acc_mode, flag); if (error) goto exit; - return nameidata_to_filp(nd, sys_open_flag); + return nameidata_to_filp(&nd, sys_open_flag); exit_dput: - dput_path(&path, nd); + dput_path(&path, &nd); exit: - if (!IS_ERR(nd->intent.open.file)) - release_open_intent(nd); - path_release(nd); + if (!IS_ERR(&nd.intent.open.file)) + release_open_intent(&nd); + path_release(&nd); return ERR_PTR(error); do_link: @@ -1856,42 +1857,42 @@ do_link: * After that we have the parent and last component, i.e. * we are in the same situation as after the first path_walk(). * Well, almost - if the last component is normal we get its copy - * stored in nd->last.name and we will have to putname() it when we + * stored in nd.last.name and we will have to putname() it when we * are done. Procfs-like symlinks just set LAST_BIND. */ - nd->flags |= LOOKUP_PARENT; - error = security_inode_follow_link(path.dentry, nd); + nd.flags |= LOOKUP_PARENT; + error = security_inode_follow_link(path.dentry, &nd); if (error) goto exit_dput; - error = __do_follow_link(&path, nd); + error = __do_follow_link(&path, &nd); if (error) { /* Does someone understand code flow here? Or it is only * me so stupid? Anathema to whoever designed this non-sense * with "intent.open". */ - release_open_intent(nd); + release_open_intent(&nd); return ERR_PTR(error); } - nd->flags &= ~LOOKUP_PARENT; - if (nd->last_type == LAST_BIND) + nd.flags &= ~LOOKUP_PARENT; + if (nd.last_type == LAST_BIND) goto ok; error = -EISDIR; - if (nd->last_type != LAST_NORM) + if (nd.last_type != LAST_NORM) goto exit; - if (nd->last.name[nd->last.len]) { - __putname(nd->last.name); + if (nd.last.name[nd.last.len]) { + __putname(nd.last.name); goto exit; } error = -ELOOP; if (count++==32) { - __putname(nd->last.name); + __putname(nd.last.name); goto exit; } - dir = nd->dentry; + dir = nd.dentry; mutex_lock(&dir->d_inode->i_mutex); - path.dentry = lookup_hash(nd); - path.mnt = nd->mnt; - __putname(nd->last.name); + path.dentry = lookup_hash(&nd); + path.mnt = nd.mnt; + __putname(nd.last.name); goto do_last; } diff -puN fs/nfsctl.c~kill-filp_open fs/nfsctl.c --- a/fs/nfsctl.c~kill-filp_open +++ a/fs/nfsctl.c @@ -35,6 +35,11 @@ static struct file *do_open(char *name, if (error) return ERR_PTR(error); + /* + * If O_TRUNC is ever passed into may_open() + * it will be necessary to take and release + * mnt writer count around these calls. + */ if (flags == O_RDWR) error = may_open(&nd,MAY_READ|MAY_WRITE,FMODE_READ|FMODE_WRITE); else diff -puN fs/open.c~kill-filp_open fs/open.c --- a/fs/open.c~kill-filp_open +++ a/fs/open.c @@ -802,8 +802,7 @@ cleanup_file: struct file *filp_open(const char *filename, int flags, int mode) { - struct nameidata nd; - return open_namei(AT_FDCWD, filename, flags, mode, &nd); + return open_namei(AT_FDCWD, filename, flags, mode); } EXPORT_SYMBOL(filp_open); @@ -1007,8 +1006,7 @@ long do_sys_open(int dfd, const char __u fd = get_unused_fd_flags(flags); if (fd >= 0) { - struct nameidata nd; - struct file *f = open_namei(dfd, tmp, flags, mode, &nd); + struct file *f = open_pathname(dfd, tmp, flags, mode); if (IS_ERR(f)) { put_unused_fd(fd); diff -puN fs/reiserfs/journal.c~kill-filp_open fs/reiserfs/journal.c --- a/fs/reiserfs/journal.c~kill-filp_open +++ a/fs/reiserfs/journal.c @@ -2625,7 +2625,7 @@ static int journal_init_dev(struct super return 0; } - journal->j_dev_file = filp_open(jdev_name, 0, 0); + journal->j_dev_file = open_namei(AT_FDCWD, jdev_name, 0, 0); if (!IS_ERR(journal->j_dev_file)) { struct inode *jdev_inode = journal->j_dev_file->f_mapping->host; if (!S_ISBLK(jdev_inode->i_mode)) { diff -puN include/linux/fs.h~kill-filp_open include/linux/fs.h --- a/include/linux/fs.h~kill-filp_open +++ a/include/linux/fs.h @@ -1545,7 +1545,6 @@ extern int do_truncate(struct dentry *, struct file *filp); extern long do_sys_open(int dfd, const char __user *filename, int flags, int mode); -extern struct file *filp_open(const char *, int, int); extern struct file * dentry_open(struct dentry *, struct vfsmount *, int); extern int filp_close(struct file *, fl_owner_t id); extern char * getname(const char __user *); @@ -1719,7 +1718,7 @@ extern struct file *create_read_pipe(str extern struct file *create_write_pipe(void); extern void free_write_pipe(struct file *); -extern struct file *open_namei(int dfd, const char *, int, int, struct nameidata *); +extern struct file *open_pathname(int dfd, const char *, int, int); extern int may_open(struct nameidata *, int, int); extern int kernel_read(struct file *, unsigned long, char *, unsigned long); diff -puN kernel/acct.c~kill-filp_open kernel/acct.c --- a/kernel/acct.c~kill-filp_open +++ a/kernel/acct.c @@ -208,7 +208,7 @@ static int acct_on(char *name) int error; /* Difference from BSD - they don't do O_APPEND */ - file = filp_open(name, O_WRONLY|O_APPEND|O_LARGEFILE, 0); + file = open_namei(AT_FDCWD, name, O_WRONLY|O_APPEND|O_LARGEFILE, 0); if (IS_ERR(file)) return PTR_ERR(file); diff -puN mm/swapfile.c~kill-filp_open mm/swapfile.c --- a/mm/swapfile.c~kill-filp_open +++ a/mm/swapfile.c @@ -1192,7 +1192,7 @@ asmlinkage long sys_swapoff(const char _ if (IS_ERR(pathname)) goto out; - victim = filp_open(pathname, O_RDWR|O_LARGEFILE, 0); + victim = open_namei(AT_FDCWD, pathname, O_RDWR|O_LARGEFILE, 0); putname(pathname); err = PTR_ERR(victim); if (IS_ERR(victim)) @@ -1471,7 +1471,7 @@ asmlinkage long sys_swapon(const char __ name = NULL; goto bad_swap_2; } - swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0); + swap_file = open_namei(AT_FDCWD, name, O_RDWR|O_LARGEFILE, 0); error = PTR_ERR(swap_file); if (IS_ERR(swap_file)) { swap_file = NULL; diff -puN sound/sound_firmware.c~kill-filp_open sound/sound_firmware.c --- a/sound/sound_firmware.c~kill-filp_open +++ a/sound/sound_firmware.c @@ -14,7 +14,7 @@ static int do_mod_firmware_load(const ch char *dp; loff_t pos; - filp = filp_open(fn, 0, 0); + filp = open_namei(AT_FDCWD, fn, 0, 0); if (IS_ERR(filp)) { printk(KERN_INFO "Unable to load '%s'.\n", fn); _