mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro:
- Preparations of parallel lookups (the remaining main obstacle is the
need to move security_d_instantiate(); once that becomes safe, the
rest will be a matter of rather short series local to fs/*.c
- preadv2/pwritev2 series from Christoph
- assorted fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (32 commits)
splice: handle zero nr_pages in splice_to_pipe()
vfs: show_vfsstat: do not ignore errors from show_devname method
dcache.c: new helper: __d_add()
don't bother with __d_instantiate(dentry, NULL)
untangle fsnotify_d_instantiate() a bit
uninline d_add()
replace d_add_unique() with saner primitive
quota: use lookup_one_len_unlocked()
cifs_get_root(): use lookup_one_len_unlocked()
nfs_lookup: don't bother with d_instantiate(dentry, NULL)
kill dentry_unhash()
ceph_fill_trace(): don't bother with d_instantiate(dn, NULL)
autofs4: don't bother with d_instantiate(dentry, NULL) in ->lookup()
configfs: move d_rehash() into configfs_create() for regular files
ceph: don't bother with d_rehash() in splice_dentry()
namei: teach lookup_slow() to skip revalidate
namei: massage lookup_slow() to be usable by lookup_one_len_unlocked()
lookup_one_len_unlocked(): use lookup_dcache()
namei: simplify invalidation logics in lookup_dcache()
namei: change calling conventions for lookup_{fast,slow} and follow_managed()
...
This commit is contained in:
commit
3c2de27d79
33 changed files with 488 additions and 465 deletions
|
|
@ -432,14 +432,9 @@ static int configfs_attach_attr(struct configfs_dirent * sd, struct dentry * den
|
|||
(sd->s_type & CONFIGFS_ITEM_BIN_ATTR) ?
|
||||
configfs_init_bin_file :
|
||||
configfs_init_file);
|
||||
if (error) {
|
||||
if (error)
|
||||
configfs_put(sd);
|
||||
return error;
|
||||
}
|
||||
|
||||
d_rehash(dentry);
|
||||
|
||||
return 0;
|
||||
return error;
|
||||
}
|
||||
|
||||
static struct dentry * configfs_lookup(struct inode *dir,
|
||||
|
|
|
|||
|
|
@ -201,9 +201,17 @@ int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct in
|
|||
configfs_set_inode_lock_class(sd, inode);
|
||||
|
||||
init(inode);
|
||||
d_instantiate(dentry, inode);
|
||||
if (S_ISDIR(mode) || S_ISLNK(mode))
|
||||
if (S_ISDIR(mode) || S_ISLNK(mode)) {
|
||||
/*
|
||||
* ->symlink(), ->mkdir(), configfs_register_subsystem() or
|
||||
* create_default_group() - already hashed.
|
||||
*/
|
||||
d_instantiate(dentry, inode);
|
||||
dget(dentry); /* pin link and directory dentries in core */
|
||||
} else {
|
||||
/* ->lookup() */
|
||||
d_add(dentry, inode);
|
||||
}
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue