export-ext4_empty_dir

   1 ext4 crypto: export ext4_empty_dir()
   2
   3 From: Michael Halcrow <mhalcrow@google.com>
   4
   5 Required for future encryption xattr changes.
   6
   7 Change-Id: Ib12fcceed8af6e2460bc387ec94434cf51b7befb
   8 Signed-off-by: Michael Halcrow <mhalcrow@google.com>
   9 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  10 ---
  11  fs/ext4/ext4.h  |  1 +
  12  fs/ext4/namei.c | 11 ++++++-----
  13  2 files changed, 7 insertions(+), 5 deletions(-)
  14
  15 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
  16 index 1ac1da6..92a9bf6 100644
  17 --- a/fs/ext4/ext4.h
  18 +++ b/fs/ext4/ext4.h
  19 @@ -2187,6 +2187,7 @@ extern int ext4_generic_delete_entry(handle_t *handle,
  20                                      void *entry_buf,
  21                                      int buf_size,
  22                                      int csum_size);
  23 +extern int ext4_empty_dir(struct inode *inode);
  24
  25  /* resize.c */
  26  extern int ext4_group_add(struct super_block *sb,
  27 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
  28 index 4262118..55dc956 100644
  29 --- a/fs/ext4/namei.c
  30 +++ b/fs/ext4/namei.c
  31 @@ -2450,7 +2450,7 @@ out_stop:
  32  /*
  33   * routine to check that the specified directory is empty (for rmdir)
  34   */
  35 -static int empty_dir(struct inode *inode)
  36 +int ext4_empty_dir(struct inode *inode)
  37  {
  38         unsigned int offset;
  39         struct buffer_head *bh;
  40 @@ -2718,7 +2718,7 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry)
  41                 goto end_rmdir;
  42
  43         retval = -ENOTEMPTY;
  44 -       if (!empty_dir(inode))
  45 +       if (!ext4_empty_dir(inode))
  46                 goto end_rmdir;
  47
  48         handle = ext4_journal_start(dir, EXT4_HT_DIR,
  49 @@ -3273,7 +3273,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
  50         if (S_ISDIR(old.inode->i_mode)) {
  51                 if (new.inode) {
  52                         retval = -ENOTEMPTY;
  53 -                       if (!empty_dir(new.inode))
  54 +                       if (!ext4_empty_dir(new.inode))
  55                                 goto end_rename;
  56                 } else {
  57                         retval = -EMLINK;
  58 @@ -3347,8 +3347,9 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
  59
  60                 ext4_dec_count(handle, old.dir);
  61                 if (new.inode) {
  62 -                       /* checked empty_dir above, can't have another parent,
  63 -                        * ext4_dec_count() won't work for many-linked dirs */
  64 +                       /* checked ext4_empty_dir above, can't have another
  65 +                        * parent, ext4_dec_count() won't work for many-linked
  66 +                        * dirs */
  67                         clear_nlink(new.inode);
  68                 } else {
  69                         ext4_inc_count(handle, new.dir);
  70 --
  71 2.1.0
  72