target/linux/generic/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch

   1 --- a/fs/mini_fo/super.c
   2 +++ b/fs/mini_fo/super.c
   3 @@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
   4  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
   5
   6
   7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
   8  STATIC void
   9  mini_fo_put_inode(inode_t *inode)
  10  {
  11 @@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
  12         if (atomic_read(&inode->i_count) == 1)
  13                 inode->i_nlink = 0;
  14  }
  15 +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
  16
  17
  18  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
  19 @@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
  20   * dies.
  21   */
  22  STATIC void
  23 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
  24 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
  25  mini_fo_umount_begin(struct vfsmount *mnt, int flags)
  26  {
  27         struct vfsmount *hidden_mnt;
  28 @@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
  29  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
  30         write_inode:    mini_fo_write_inode,
  31  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
  32 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
  33         put_inode:              mini_fo_put_inode,
  34 +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
  35  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
  36         delete_inode:   mini_fo_delete_inode,
  37  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */