evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ext4 crypto: export ext4_empty_dir()

Browse source 
Required for future encryption xattr changes.

Signed-off-by: Michael Halcrow <mhalcrow@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Michael Halcrow 2015-04-11 07:46:49 -04:00 • committed by Theodore Ts'o
parent b17655fb7f
commit e875a2ddba
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs/ext4/ext4.h
View file

@ -2199,6 +2199,7 @@ extern int ext4_generic_delete_entry(handle_t *handle,
void *entry_buf, void *entry_buf,
int buf_size, int buf_size,
int csum_size); int csum_size);
extern int ext4_empty_dir(struct inode *inode);
/* resize.c */ /* resize.c */
extern int ext4_group_add(struct super_block *sb, extern int ext4_group_add(struct super_block *sb,

11
fs/ext4/namei.c
View file

@ -2457,7 +2457,7 @@ out_stop:
/* /*
* routine to check that the specified directory is empty (for rmdir) * routine to check that the specified directory is empty (for rmdir)
*/ */
static int empty_dir(struct inode *inode) int ext4_empty_dir(struct inode *inode)
{ {
unsigned int offset; unsigned int offset;
struct buffer_head *bh; struct buffer_head *bh;
@ -2725,7 +2725,7 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry)
goto end_rmdir; goto end_rmdir;
retval = -ENOTEMPTY; retval = -ENOTEMPTY;
if (!empty_dir(inode)) if (!ext4_empty_dir(inode))
goto end_rmdir; goto end_rmdir;
handle = ext4_journal_start(dir, EXT4_HT_DIR, handle = ext4_journal_start(dir, EXT4_HT_DIR,
@ -3285,7 +3285,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
if (S_ISDIR(old.inode->i_mode)) { if (S_ISDIR(old.inode->i_mode)) {
if (new.inode) { if (new.inode) {
retval = -ENOTEMPTY; retval = -ENOTEMPTY;
if (!empty_dir(new.inode)) if (!ext4_empty_dir(new.inode))
goto end_rename; goto end_rename;
} else { } else {
retval = -EMLINK; retval = -EMLINK;
@ -3359,8 +3359,9 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
ext4_dec_count(handle, old.dir); ext4_dec_count(handle, old.dir);
if (new.inode) { if (new.inode) {
/* checked empty_dir above, can't have another parent, /* checked ext4_empty_dir above, can't have another
* ext4_dec_count() won't work for many-linked dirs */ * parent, ext4_dec_count() won't work for many-linked
* dirs */
clear_nlink(new.inode); clear_nlink(new.inode);
} else { } else {
ext4_inc_count(handle, new.dir); ext4_inc_count(handle, new.dir);