target/linux/generic/patches-4.4/051-0001-ovl-rename-is_merge-to-is_lowest.patch

   1 From 56656e960b555cb98bc414382566dcb59aae99a2 Mon Sep 17 00:00:00 2001
   2 From: Miklos Szeredi <mszeredi@redhat.com>
   3 Date: Mon, 21 Mar 2016 17:31:46 +0100
   4 Subject: [PATCH] ovl: rename is_merge to is_lowest
   5
   6 The 'is_merge' is an historical naming from when only a single lower layer
   7 could exist.  With the introduction of multiple lower layers the meaning of
   8 this flag was changed to mean only the "lowest layer" (while all lower
   9 layers were being merged).
  10
  11 So now 'is_merge' is inaccurate and hence renaming to 'is_lowest'
  12
  13 Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  14 ---
  15  fs/overlayfs/readdir.c | 16 ++++++++--------
  16  1 file changed, 8 insertions(+), 8 deletions(-)
  17
  18 --- a/fs/overlayfs/readdir.c
  19 +++ b/fs/overlayfs/readdir.c
  20 @@ -36,7 +36,7 @@ struct ovl_dir_cache {
  21
  22  struct ovl_readdir_data {
  23         struct dir_context ctx;
  24 -       bool is_merge;
  25 +       bool is_lowest;
  26         struct rb_root root;
  27         struct list_head *list;
  28         struct list_head middle;
  29 @@ -139,9 +139,9 @@ static int ovl_cache_entry_add_rb(struct
  30         return 0;
  31  }
  32
  33 -static int ovl_fill_lower(struct ovl_readdir_data *rdd,
  34 -                         const char *name, int namelen,
  35 -                         loff_t offset, u64 ino, unsigned int d_type)
  36 +static int ovl_fill_lowest(struct ovl_readdir_data *rdd,
  37 +                          const char *name, int namelen,
  38 +                          loff_t offset, u64 ino, unsigned int d_type)
  39  {
  40         struct ovl_cache_entry *p;
  41
  42 @@ -193,10 +193,10 @@ static int ovl_fill_merge(struct dir_con
  43                 container_of(ctx, struct ovl_readdir_data, ctx);
  44
  45         rdd->count++;
  46 -       if (!rdd->is_merge)
  47 +       if (!rdd->is_lowest)
  48                 return ovl_cache_entry_add_rb(rdd, name, namelen, ino, d_type);
  49         else
  50 -               return ovl_fill_lower(rdd, name, namelen, offset, ino, d_type);
  51 +               return ovl_fill_lowest(rdd, name, namelen, offset, ino, d_type);
  52  }
  53
  54  static int ovl_check_whiteouts(struct dentry *dir, struct ovl_readdir_data *rdd)
  55 @@ -289,7 +289,7 @@ static int ovl_dir_read_merged(struct de
  56                 .ctx.actor = ovl_fill_merge,
  57                 .list = list,
  58                 .root = RB_ROOT,
  59 -               .is_merge = false,
  60 +               .is_lowest = false,
  61         };
  62         int idx, next;
  63
  64 @@ -306,7 +306,7 @@ static int ovl_dir_read_merged(struct de
  65                          * allows offsets to be reasonably constant
  66                          */
  67                         list_add(&rdd.middle, rdd.list);
  68 -                       rdd.is_merge = true;
  69 +                       rdd.is_lowest = true;
  70                         err = ovl_dir_read(&realpath, &rdd);
  71                         list_del(&rdd.middle);
  72                 }