diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 16:36:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 16:36:41 -0400 |
commit | e2a0883e4071237d09b604a342c28b96b44a04b3 (patch) | |
tree | aa56f4d376b5eb1c32358c19c2669c2a94e0e1fd /fs/dcache.c | |
parent | 3a990a52f9f25f45469e272017a31e7a3fda60ed (diff) | |
parent | 07c0c5d8b8c122b2f2df9ee574ac3083daefc981 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs pile 1 from Al Viro:
"This is _not_ all; in particular, Miklos' and Jan's stuff is not there
yet."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits)
ext4: initialization of ext4_li_mtx needs to be done earlier
debugfs-related mode_t whack-a-mole
hfsplus: add an ioctl to bless files
hfsplus: change finder_info to u32
hfsplus: initialise userflags
qnx4: new helper - try_extent()
qnx4: get rid of qnx4_bread/qnx4_getblk
take removal of PF_FORKNOEXEC to flush_old_exec()
trim includes in inode.c
um: uml_dup_mmap() relies on ->mmap_sem being held, but activate_mm() doesn't hold it
um: embed ->stub_pages[] into mmu_context
gadgetfs: list_for_each_safe() misuse
ocfs2: fix leaks on failure exits in module_init
ecryptfs: make register_filesystem() the last potential failure exit
ntfs: forgets to unregister sysctls on register_filesystem() failure
logfs: missing cleanup on register_filesystem() failure
jfs: mising cleanup on register_filesystem() failure
make configfs_pin_fs() return root dentry on success
configfs: configfs_create_dir() has parent dentry in dentry->d_parent
configfs: sanitize configfs_create()
...
Diffstat (limited to 'fs/dcache.c')
-rw-r--r-- | fs/dcache.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 11828de68dce..e441941c834d 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
@@ -1466,30 +1466,6 @@ struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode) | |||
1466 | 1466 | ||
1467 | EXPORT_SYMBOL(d_instantiate_unique); | 1467 | EXPORT_SYMBOL(d_instantiate_unique); |
1468 | 1468 | ||
1469 | /** | ||
1470 | * d_alloc_root - allocate root dentry | ||
1471 | * @root_inode: inode to allocate the root for | ||
1472 | * | ||
1473 | * Allocate a root ("/") dentry for the inode given. The inode is | ||
1474 | * instantiated and returned. %NULL is returned if there is insufficient | ||
1475 | * memory or the inode passed is %NULL. | ||
1476 | */ | ||
1477 | |||
1478 | struct dentry * d_alloc_root(struct inode * root_inode) | ||
1479 | { | ||
1480 | struct dentry *res = NULL; | ||
1481 | |||
1482 | if (root_inode) { | ||
1483 | static const struct qstr name = { .name = "/", .len = 1 }; | ||
1484 | |||
1485 | res = __d_alloc(root_inode->i_sb, &name); | ||
1486 | if (res) | ||
1487 | d_instantiate(res, root_inode); | ||
1488 | } | ||
1489 | return res; | ||
1490 | } | ||
1491 | EXPORT_SYMBOL(d_alloc_root); | ||
1492 | |||
1493 | struct dentry *d_make_root(struct inode *root_inode) | 1469 | struct dentry *d_make_root(struct inode *root_inode) |
1494 | { | 1470 | { |
1495 | struct dentry *res = NULL; | 1471 | struct dentry *res = NULL; |