struct md_open_data;
struct obd_client_handle {
- struct lustre_handle och_fh;
- struct lu_fid och_fid;
- struct md_open_data *och_mod;
- __u32 och_magic;
- int och_flags;
+ struct lustre_handle och_fh;
+ struct lu_fid och_fid;
+ struct md_open_data *och_mod;
+ struct lustre_handle och_lease_handle; /* open lock for lease */
+ __u32 och_magic;
+ int och_flags;
};
#define OBD_CLIENT_HANDLE_MAGIC 0xd15ea5ed
int offset = 0;
ENTRY;
- err = cfs_copy_from_user(&hdr, (void *)arg, sizeof(hdr));
+ err = copy_from_user(&hdr, (void *)arg, sizeof(hdr));
if (err)
RETURN(err);
*len = hdr.ioc_len;
data = (struct obd_ioctl_data *)*buf;
- err = cfs_copy_from_user(*buf, (void *)arg, hdr.ioc_len);
+ err = copy_from_user(*buf, (void *)arg, hdr.ioc_len);
if (err) {
OBD_FREE_LARGE(*buf, hdr.ioc_len);
RETURN(err);
static inline int obd_ioctl_popdata(void *arg, void *data, int len)
{
- int err = cfs_copy_to_user(arg, data, len);
- if (err)
- err = -EFAULT;
- return err;
+ int err = copy_to_user(arg, data, len);
+ if (err)
+ err = -EFAULT;
+ return err;
}
#endif
} while (0)
#else /* !__KERNEL__ */
+
#define __l_wait_event(wq, condition, info, ret, l_add_wait) \
do { \
long __timeout = info->lwi_timeout; \
} \
} \
} \
- SET_BUT_UNUSED(wq); \
} while (0)
#endif /* __KERNEL__ */