diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-03 11:41:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-03 11:41:14 -0700 |
| commit | 58ec9059b396a570b208239b4edc45eeb68b14c4 (patch) | |
| tree | 9f7943ef6bb77535b0e4b3531b6eae4bf51ec5a5 /fs/open.c | |
| parent | d3acb15a3a1b841dc709c3853ec900170b2478e5 (diff) | |
| parent | 7962c7d196e36aa597fadb78c1cb4fe7e209f803 (diff) | |
| download | linux-rpi-58ec9059b396a570b208239b4edc45eeb68b14c4.tar.gz linux-rpi-58ec9059b396a570b208239b4edc45eeb68b14c4.tar.bz2 linux-rpi-58ec9059b396a570b208239b4edc45eeb68b14c4.zip | |
Merge branch 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs name lookup updates from Al Viro:
"Small namei.c patch series, mostly to simplify the rules for nameidata
state. It's actually from the previous cycle - but I didn't post it
for review in time...
Changes visible outside of fs/namei.c: file_open_root() calling
conventions change, some freed bits in LOOKUP_... space"
* 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
namei: make sure nd->depth is always valid
teach set_nameidata() to handle setting the root as well
take LOOKUP_{ROOT,ROOT_GRABBED,JUMPED} out of LOOKUP_... space
switch file_open_root() to struct path
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/open.c b/fs/open.c index 1a325b3194df..94bef26ff1b6 100644 --- a/fs/open.c +++ b/fs/open.c @@ -1173,7 +1173,7 @@ struct file *filp_open(const char *filename, int flags, umode_t mode) } EXPORT_SYMBOL(filp_open); -struct file *file_open_root(struct dentry *dentry, struct vfsmount *mnt, +struct file *file_open_root(const struct path *root, const char *filename, int flags, umode_t mode) { struct open_flags op; @@ -1181,7 +1181,7 @@ struct file *file_open_root(struct dentry *dentry, struct vfsmount *mnt, int err = build_open_flags(&how, &op); if (err) return ERR_PTR(err); - return do_file_open_root(dentry, mnt, filename, &op); + return do_file_open_root(root, filename, &op); } EXPORT_SYMBOL(file_open_root); |