fusd.patch

   1 diff -Naur fusd/include/kfusd.h fusd.new/include/kfusd.h
   2 --- fusd/include/kfusd.h        2008-06-10 20:32:22.000000000 -0400
   3 +++ fusd.new/include/kfusd.h    2008-06-10 20:33:25.000000000 -0400
   4 @@ -58,7 +58,7 @@
   5  #define MAX_FILEARRAY_SIZE  1024 /* maximum it can grow to */
   6
   7  /* maximum read/write size we're willing to service */
   8 -#define MAX_RW_SIZE         (1024*128)
   9 +#define MAX_RW_SIZE         (1024*1280*4)
  10
  11
  12  /********************** Structure Definitions *******************************/
  13 diff -Naur fusd/kfusd/kfusd.c fusd.new/kfusd/kfusd.c
  14 --- fusd/kfusd/kfusd.c  2008-06-10 20:32:23.000000000 -0400
  15 +++ fusd.new/kfusd/kfusd.c      2008-06-10 20:32:58.000000000 -0400
  16 @@ -128,6 +128,22 @@
  17
  18  #endif
  19
  20 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
  21 +/* moved to private kernel header in 2.6.21 */
  22 +struct sysfs_dirent {
  23 +       atomic_t                s_count;
  24 +       struct list_head        s_sibling;
  25 +       struct list_head        s_children;
  26 +       void                    * s_element;
  27 +       int                     s_type;
  28 +       umode_t                 s_mode;
  29 +       ino_t                   s_ino;
  30 +       struct dentry           * s_dentry;
  31 +       struct iattr            * s_iattr;
  32 +       atomic_t                s_event;
  33 +};
  34 +#endif
  35 +
  36  static inline struct kobject * to_kobj(struct dentry * dentry)
  37  {
  38    struct sysfs_dirent * sd = dentry->d_fsdata;
  39 @@ -137,7 +153,7 @@
  40      return NULL;
  41  }
  42
  43 -#define to_class(obj) container_of(obj, struct class, subsys.kset.kobj)
  44 +#define to_class(obj) container_of(obj, struct class, subsys.kobj)
  45
  46  /**************************************************************************/
  47
  48 @@ -2399,17 +2415,17 @@
  49  }
  50
  51
  52 -STATIC ssize_t fusd_writev(struct file *file,
  53 -                          const struct iovec *iov,
  54 -                          unsigned long count,
  55 -                          loff_t *offset)
  56 +STATIC ssize_t fusd_aio_write(struct kiocb *iocb,
  57 +                             const struct iovec *iov,
  58 +                             unsigned long count,
  59 +                             loff_t pos)
  60  {
  61    if (count != 2) {
  62      RDEBUG(2, "fusd_writev: got illegal iov count of %ld", count);
  63      return -EINVAL;
  64    }
  65
  66 -  return fusd_process_write(file,
  67 +  return fusd_process_write(iocb->ki_filp,
  68                             iov[0].iov_base, iov[0].iov_len,
  69                             iov[1].iov_base, iov[1].iov_len);
  70  }
  71 @@ -2596,13 +2612,13 @@
  72
  73
  74  STATIC struct file_operations fusd_fops = {
  75 -  owner:    THIS_MODULE,
  76 -  open:     fusd_open,
  77 -  read:     fusd_read,
  78 -  write:    fusd_write,
  79 -  writev:   fusd_writev,
  80 -  release:  fusd_release,
  81 -  poll:     fusd_poll,
  82 +  owner:     THIS_MODULE,
  83 +  open:      fusd_open,
  84 +  read:      fusd_read,
  85 +  write:     fusd_write,
  86 +  aio_write: fusd_aio_write,
  87 +  release:   fusd_release,
  88 +  poll:      fusd_poll,
  89  };
  90
  91