# endif
#endif
+#ifndef HAVE_LINUX_FILE_DENTRY
+#define file_dentry(file) ((file)->f_dentry)
+#endif
+
#if defined(HAVE_LINUX_LOCKS_LOCK_FILE_WAIT)
# define flock_lock_file_wait locks_lock_file_wait
#endif
afs_linux_key_alloc(struct key_type *type, const char *desc, afs_kuid_t uid,
afs_kgid_t gid, key_perm_t perm, unsigned long flags)
{
-# if defined(KEY_ALLOC_NEEDS_STRUCT_TASK)
+# if defined(KEY_ALLOC_BYPASS_RESTRICTION)
+ return key_alloc(type, desc, uid, gid, current_cred(), perm, flags, NULL);
+# elif defined(KEY_ALLOC_NEEDS_STRUCT_TASK)
return key_alloc(type, desc, uid, gid, current, perm, flags);
# elif defined(KEY_ALLOC_NEEDS_CRED)
return key_alloc(type, desc, uid, gid, current_cred(), perm, flags);
key_ref_t key_ref;
if (afs_session_keyring(cred)) {
+# if defined(KEYRING_SEARCH_TAKES_RECURSE)
+ key_ref = keyring_search(
+ make_key_ref(afs_session_keyring(cred), 1),
+ type, "_pag", 1);
+# else
key_ref = keyring_search(
make_key_ref(afs_session_keyring(cred), 1),
type, "_pag");
+# endif
if (IS_ERR(key_ref))
return ERR_CAST(key_ref);
static inline loff_t
page_offset(struct page *pp)
{
- return (((loff_t) pp->index) << PAGE_CACHE_SHIFT);
+ return (((loff_t) pp->index) << PAGE_SHIFT);
}
#endif
static inline void
afs_linux_lock_inode(struct inode *ip) {
-#ifdef STRUCT_INODE_HAS_I_MUTEX
+#if defined(HAVE_LINUX_INODE_LOCK)
+ inode_lock(ip);
+#elif defined(STRUCT_INODE_HAS_I_MUTEX)
mutex_lock(&ip->i_mutex);
#else
down(&ip->i_sem);
static inline void
afs_linux_unlock_inode(struct inode *ip) {
-#ifdef STRUCT_INODE_HAS_I_MUTEX
+#if defined(HAVE_LINUX_INODE_LOCK)
+ inode_unlock(ip);
+#elif defined(STRUCT_INODE_HAS_I_MUTEX)
mutex_unlock(&ip->i_mutex);
#else
up(&ip->i_sem);
#endif
}
+/* Use these to lock or unlock an inode for processing
+ * its dentry aliases en masse.
+ */
+#if defined(HAVE_DCACHE_LOCK)
+#define afs_d_alias_lock(ip) spin_lock(&dcache_lock)
+#define afs_d_alias_unlock(ip) spin_unlock(&dcache_lock)
+#else
+#define afs_d_alias_lock(ip) spin_lock(&(ip)->i_lock)
+#define afs_d_alias_unlock(ip) spin_unlock(&(ip)->i_lock)
+#endif
+
+
+/* Use this instead of dget for dentry operations
+ * that occur under a higher lock (e.g. alias processing).
+ * Requires that the higher lock (e.g. dcache_lock or
+ * inode->i_lock) is already held.
+ */
+static inline void
+afs_linux_dget(struct dentry *dp) {
+#if defined(HAVE_DCACHE_LOCK)
+ dget_locked(dp);
+#else
+ dget(dp);
+#endif
+}
+
+
static inline int
afs_inode_setattr(struct osi_file *afile, struct iattr *newattrs) {
}
static inline struct proc_dir_entry *
-afs_proc_create(char *name, umode_t mode, struct proc_dir_entry *parent, struct file_operations *fops) {
+#if defined(HAVE_LINUX_STRUCT_PROC_OPS)
+afs_proc_create(char *name, umode_t mode, struct proc_dir_entry *parent, struct proc_ops *ops) {
+#else
+afs_proc_create(char *name, umode_t mode, struct proc_dir_entry *parent, struct file_operations *ops) {
+#endif
#if defined(HAVE_LINUX_PROC_CREATE)
- return proc_create(name, mode, parent, fops);
+ return proc_create(name, mode, parent, ops);
#else
struct proc_dir_entry *entry;
entry = create_proc_entry(name, mode, parent);
if (entry)
- entry->proc_fops = fops;
+ entry->proc_fops = ops;
return entry;
#endif
}
#endif
}
+#if defined(HAVE_LINUX___VFS_WRITE)
+# define AFS_FILE_NEEDS_SET_FS 1
+#elif defined(HAVE_LINUX_KERNEL_WRITE)
+/* #undef AFS_FILE_NEEDS_SET_FS */
+#else
+# define AFS_FILE_NEEDS_SET_FS 1
+#endif
+
static inline int
afs_file_read(struct file *filp, char __user *buf, size_t len, loff_t *pos)
{
-#if defined(HAVE_LINUX___VFS_READ)
+#if defined(HAVE_LINUX___VFS_WRITE)
return __vfs_read(filp, buf, len, pos);
+#elif defined(HAVE_LINUX_KERNEL_WRITE)
+# if defined(KERNEL_READ_OFFSET_IS_LAST)
+ return kernel_read(filp, buf, len, pos);
+# else
+ return kernel_read(filp, *pos, buf, len);
+# endif
#else
return filp->f_op->read(filp, buf, len, pos);
#endif
static inline int
afs_file_write(struct file *filp, char __user *buf, size_t len, loff_t *pos)
{
-#if defined(HAVE_LINUX___VFS_READ)
+#if defined(HAVE_LINUX___VFS_WRITE)
return __vfs_write(filp, buf, len, pos);
+#elif defined(HAVE_LINUX_KERNEL_WRITE)
+# if defined(KERNEL_READ_OFFSET_IS_LAST)
+ return kernel_write(filp, buf, len, pos);
+# else
+ return kernel_write(filp, buf, len, *pos);
+# endif
#else
return filp->f_op->write(filp, buf, len, pos);
#endif