target/linux/generic/patches-4.4/505-yaffs-3.19-f_dentry-remove.patch

   1 --- a/fs/yaffs2/yaffs_vfs.c
   2 +++ b/fs/yaffs2/yaffs_vfs.c
   3 @@ -283,7 +283,7 @@ static int yaffs_readpage_nolock(struct
   4                 (long long)pos,
   5                 (unsigned)PAGE_CACHE_SIZE);
   6
   7 -       obj = yaffs_dentry_to_obj(f->f_dentry);
   8 +       obj = yaffs_dentry_to_obj(f->f_path.dentry);
   9
  10         dev = obj->my_dev;
  11
  12 @@ -481,7 +481,7 @@ static ssize_t yaffs_hold_space(struct f
  13
  14         int n_free_chunks;
  15
  16 -       obj = yaffs_dentry_to_obj(f->f_dentry);
  17 +       obj = yaffs_dentry_to_obj(f->f_path.dentry);
  18
  19         dev = obj->my_dev;
  20
  21 @@ -499,7 +499,7 @@ static void yaffs_release_space(struct f
  22         struct yaffs_obj *obj;
  23         struct yaffs_dev *dev;
  24
  25 -       obj = yaffs_dentry_to_obj(f->f_dentry);
  26 +       obj = yaffs_dentry_to_obj(f->f_path.dentry);
  27
  28         dev = obj->my_dev;
  29
  30 @@ -591,7 +591,7 @@ static ssize_t yaffs_file_write(struct f
  31         struct inode *inode;
  32         struct yaffs_dev *dev;
  33
  34 -       obj = yaffs_dentry_to_obj(f->f_dentry);
  35 +       obj = yaffs_dentry_to_obj(f->f_path.dentry);
  36
  37         if (!obj) {
  38                 yaffs_trace(YAFFS_TRACE_OS,
  39 @@ -603,7 +603,7 @@ static ssize_t yaffs_file_write(struct f
  40
  41         yaffs_gross_lock(dev);
  42
  43 -       inode = f->f_dentry->d_inode;
  44 +       inode = f->f_path.dentry->d_inode;
  45
  46         if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
  47                 ipos = inode->i_size;
  48 @@ -727,7 +727,7 @@ static int yaffs_file_flush(struct file
  49  static int yaffs_file_flush(struct file *file)
  50  #endif
  51  {
  52 -       struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry);
  53 +       struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_path.dentry);
  54
  55         struct yaffs_dev *dev = obj->my_dev;
  56
  57 @@ -1734,7 +1734,7 @@ static int yaffs_iterate(struct file *f,
  58
  59         char name[YAFFS_MAX_NAME_LENGTH + 1];
  60
  61 -       obj = yaffs_dentry_to_obj(f->f_dentry);
  62 +       obj = yaffs_dentry_to_obj(f->f_path.dentry);
  63         dev = obj->my_dev;
  64
  65         yaffs_gross_lock(dev);
  66 @@ -1798,14 +1798,14 @@ static int yaffs_readdir(struct file *f,
  67         struct yaffs_obj *obj;
  68         struct yaffs_dev *dev;
  69         struct yaffs_search_context *sc;
  70 -       struct inode *inode = f->f_dentry->d_inode;
  71 +       struct inode *inode = f->f_path.dentry->d_inode;
  72         unsigned long offset, curoffs;
  73         struct yaffs_obj *l;
  74         int ret_val = 0;
  75
  76         char name[YAFFS_MAX_NAME_LENGTH + 1];
  77
  78 -       obj = yaffs_dentry_to_obj(f->f_dentry);
  79 +       obj = yaffs_dentry_to_obj(f->f_path.dentry);
  80         dev = obj->my_dev;
  81
  82         yaffs_gross_lock(dev);
  83 @@ -1839,10 +1839,10 @@ static int yaffs_readdir(struct file *f,
  84         if (offset == 1) {
  85                 yaffs_trace(YAFFS_TRACE_OS,
  86                         "yaffs_readdir: entry .. ino %d",
  87 -                       (int)f->f_dentry->d_parent->d_inode->i_ino);
  88 +                       (int)f->f_path.dentry->d_parent->d_inode->i_ino);
  89                 yaffs_gross_unlock(dev);
  90                 if (filldir(dirent, "..", 2, offset,
  91 -                           f->f_dentry->d_parent->d_inode->i_ino,
  92 +                           f->f_path.dentry->d_parent->d_inode->i_ino,
  93                             DT_DIR) < 0) {
  94                         yaffs_gross_lock(dev);
  95                         goto out;