typedef struct path afs_linux_path_t;
#endif
-#ifndef HAVE_LINUX_DO_SYNC_READ
+#if defined(STRUCT_DENTRY_HAS_D_U_D_ALIAS)
+# define d_alias d_u.d_alias
+#endif
+
+#if defined(STRUCT_FILE_HAS_F_PATH)
+# if !defined(f_dentry)
+# define f_dentry f_path.dentry
+# 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
+
+#if !defined(HAVE_LINUX_DO_SYNC_READ) && !defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
static inline int
do_sync_read(struct file *fp, char *buf, size_t count, loff_t *offp) {
return generic_file_read(fp, buf, count, offp);
#ifdef LINUX_KEYRING_SUPPORT
static inline struct key *
-afs_linux_key_alloc(struct key_type *type, const char *desc, uid_t uid,
- gid_t gid, key_perm_t perm, unsigned long flags)
+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);
}
# if defined(STRUCT_TASK_STRUCT_HAS_CRED)
+static inline struct key *
+afs_session_keyring(afs_ucred_t *cred)
+{
+# if defined(STRUCT_CRED_HAS_SESSION_KEYRING)
+ return cred->session_keyring;
+# else
+ return cred->tgcred->session_keyring;
+# endif
+}
+
static inline struct key*
afs_linux_search_keyring(afs_ucred_t *cred, struct key_type *type)
{
key_ref_t key_ref;
- if (cred->tgcred->session_keyring) {
+ if (afs_session_keyring(cred)) {
key_ref = keyring_search(
- make_key_ref(cred->tgcred->session_keyring, 1),
+ make_key_ref(afs_session_keyring(cred), 1),
type, "_pag");
if (IS_ERR(key_ref))
return ERR_CAST(key_ref);
return request_key(type, "_pag", NULL);
}
# endif /* STRUCT_TASK_STRUCT_HAS_CRED */
+
+static_inline struct key *
+afs_set_session_keyring(struct key *keyring)
+{
+ struct key *old;
+#if defined(STRUCT_CRED_HAS_SESSION_KEYRING)
+ struct cred *new_creds;
+ old = current_session_keyring();
+ new_creds = prepare_creds();
+ rcu_assign_pointer(new_creds->session_keyring, keyring);
+ commit_creds(new_creds);
+#else
+ spin_lock_irq(¤t->sighand->siglock);
+ old = task_session_keyring(current);
+ smp_wmb();
+ task_session_keyring(current) = keyring;
+ spin_unlock_irq(¤t->sighand->siglock);
+#endif
+ return old;
+}
#endif /* LINUX_KEYRING_SUPPORT */
#ifdef STRUCT_TASK_STRUCT_HAS_CRED
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);
#else
afs_get_dentry_ref(afs_linux_path_t *path, struct vfsmount **mnt, struct dentry **dpp) {
#endif
-#if defined(STRUCT_NAMEIDATA_HAS_PATH)
-# if defined(HAVE_LINUX_PATH_LOOKUP)
+#if defined(HAVE_LINUX_PATH_LOOKUP)
+# if defined(STRUCT_NAMEIDATA_HAS_PATH)
*dpp = dget(nd->path.dentry);
if (mnt)
*mnt = mntget(nd->path.mnt);
path_put(&nd->path);
# else
- *dpp = dget(path->dentry);
- if (mnt)
- *mnt = mntget(path->mnt);
- path_put(path);
-# endif
-#else
*dpp = dget(nd->dentry);
if (mnt)
*mnt = mntget(nd->mnt);
path_release(nd);
+# endif
+#else
+ *dpp = dget(path->dentry);
+ if (mnt)
+ *mnt = mntget(path->mnt);
+ path_put(path);
#endif
}
struct file *filp;
path.mnt = mnt;
path.dentry = dp;
+ /* note that dentry_open will path_get for us */
filp = dentry_open(&path, flags, creds);
return filp;
#else
- return dentry_open(dp, mntget(mnt), flags, creds);
+ return dentry_open(dget(dp), mntget(mnt), flags, creds);
#endif
}
#endif
+static inline int
+afs_truncate(struct inode *inode, int len)
+{
+ int code;
+#if defined(STRUCT_INODE_OPERATIONS_HAS_TRUNCATE)
+ code = vmtruncate(inode, len);
+#else
+ code = inode_newsize_ok(inode, len);
+ if (!code)
+ truncate_setsize(inode, len);
+#endif
+ return code;
+}
+
+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_PROC_CREATE)
+ return proc_create(name, mode, parent, fops);
+#else
+ struct proc_dir_entry *entry;
+ entry = create_proc_entry(name, mode, parent);
+ if (entry)
+ entry->proc_fops = fops;
+ return entry;
+#endif
+}
+
+static inline int
+afs_dentry_count(struct dentry *dp)
+{
+#if defined(HAVE_LINUX_D_COUNT)
+ return d_count(dp);
+#elif defined(D_COUNT_INT)
+ return dp->d_count;
+#else
+ return atomic_read(&dp->d_count);
+#endif
+}
+
+static inline void
+afs_maybe_shrink_dcache(struct dentry *dp)
+{
+#if defined(HAVE_LINUX_D_COUNT) || defined(D_COUNT_INT)
+ spin_lock(&dp->d_lock);
+ if (afs_dentry_count(dp) > 1) {
+ spin_unlock(&dp->d_lock);
+ shrink_dcache_parent(dp);
+ } else
+ spin_unlock(&dp->d_lock);
+#else
+ if (afs_dentry_count(dp) > 1)
+ shrink_dcache_parent(dp);
+#endif
+}
+
+static inline int
+afs_d_invalidate(struct dentry *dp)
+{
+#if defined(D_INVALIDATE_IS_VOID)
+ d_invalidate(dp);
+ return 0;
+#else
+ return d_invalidate(dp);
+#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_WRITE)
+ return __vfs_read(filp, buf, len, pos);
+#elif defined(HAVE_LINUX_KERNEL_WRITE)
+# if defined(LINUX_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_WRITE)
+ return __vfs_write(filp, buf, len, pos);
+#elif defined(HAVE_LINUX_KERNEL_WRITE)
+# if defined(LINUX_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
+}
+
#endif /* AFS_LINUX_OSI_COMPAT_H */
git://git.openafs.org / openafs.git / blobdiff