git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ahci: use 0x80 as wait stat value instead of 0xff
[safe/jmp/linux-2.6]
/
ipc
/
mqueue.c
diff --git
a/ipc/mqueue.c
b/ipc/mqueue.c
index
c45ae86
..
02717f7
100644
(file)
--- a/
ipc/mqueue.c
+++ b/
ipc/mqueue.c
@@
-2,7
+2,7
@@
* POSIX message queues filesystem for Linux.
*
* Copyright (C) 2003,2004 Krzysztof Benedyczak (golbi@mat.uni.torun.pl)
* POSIX message queues filesystem for Linux.
*
* Copyright (C) 2003,2004 Krzysztof Benedyczak (golbi@mat.uni.torun.pl)
- * Michal Wronski (
Michal.Wronski@motorola
.com)
+ * Michal Wronski (
michal.wronski@gmail
.com)
*
* Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com)
* Lockless receive & send, fd based notify:
*
* Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com)
* Lockless receive & send, fd based notify:
@@
-90,7
+90,7
@@
static struct super_operations mqueue_super_ops;
static void remove_notification(struct mqueue_inode_info *info);
static spinlock_t mq_lock;
static void remove_notification(struct mqueue_inode_info *info);
static spinlock_t mq_lock;
-static
kmem_cache_t
*mqueue_inode_cachep;
+static
struct kmem_cache
*mqueue_inode_cachep;
static struct vfsmount *mqueue_mnt;
static unsigned int queues_count;
static struct vfsmount *mqueue_mnt;
static unsigned int queues_count;
@@
-211,7
+211,7
@@
static int mqueue_get_sb(struct file_system_type *fs_type,
return get_sb_single(fs_type, flags, data, mqueue_fill_super, mnt);
}
return get_sb_single(fs_type, flags, data, mqueue_fill_super, mnt);
}
-static void init_once(void *foo,
kmem_cache_t
* cachep, unsigned long flags)
+static void init_once(void *foo,
struct kmem_cache
* cachep, unsigned long flags)
{
struct mqueue_inode_info *p = (struct mqueue_inode_info *) foo;
{
struct mqueue_inode_info *p = (struct mqueue_inode_info *) foo;
@@
-224,7
+224,7
@@
static struct inode *mqueue_alloc_inode(struct super_block *sb)
{
struct mqueue_inode_info *ei;
{
struct mqueue_inode_info *ei;
- ei = kmem_cache_alloc(mqueue_inode_cachep,
SLAB
_KERNEL);
+ ei = kmem_cache_alloc(mqueue_inode_cachep,
GFP
_KERNEL);
if (!ei)
return NULL;
return &ei->vfs_inode;
if (!ei)
return NULL;
return &ei->vfs_inode;
@@
-322,7
+322,7
@@
static int mqueue_unlink(struct inode *dir, struct dentry *dentry)
static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
size_t count, loff_t * off)
{
static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
size_t count, loff_t * off)
{
- struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode);
+ struct mqueue_inode_info *info = MQUEUE_I(filp->f_
path.
dentry->d_inode);
char buffer[FILENT_SIZE];
size_t slen;
loff_t o;
char buffer[FILENT_SIZE];
size_t slen;
loff_t o;
@@
-354,13
+354,13
@@
static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
return -EFAULT;
*off = o + count;
return -EFAULT;
*off = o + count;
- filp->f_
dentry->d_inode->i_atime = filp->f_
dentry->d_inode->i_ctime = CURRENT_TIME;
+ filp->f_
path.dentry->d_inode->i_atime = filp->f_path.
dentry->d_inode->i_ctime = CURRENT_TIME;
return count;
}
static int mqueue_flush_file(struct file *filp, fl_owner_t id)
{
return count;
}
static int mqueue_flush_file(struct file *filp, fl_owner_t id)
{
- struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode);
+ struct mqueue_inode_info *info = MQUEUE_I(filp->f_
path.
dentry->d_inode);
spin_lock(&info->lock);
if (task_tgid(current) == info->notify_owner)
spin_lock(&info->lock);
if (task_tgid(current) == info->notify_owner)
@@
-372,7
+372,7
@@
static int mqueue_flush_file(struct file *filp, fl_owner_t id)
static unsigned int mqueue_poll_file(struct file *filp, struct poll_table_struct *poll_tab)
{
static unsigned int mqueue_poll_file(struct file *filp, struct poll_table_struct *poll_tab)
{
- struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode);
+ struct mqueue_inode_info *info = MQUEUE_I(filp->f_
path.
dentry->d_inode);
int retval = 0;
poll_wait(filp, &info->wait_q, poll_tab);
int retval = 0;
poll_wait(filp, &info->wait_q, poll_tab);
@@
-836,7
+836,7
@@
asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
if (unlikely(!filp))
goto out;
if (unlikely(!filp))
goto out;
- inode = filp->f_dentry->d_inode;
+ inode = filp->f_
path.
dentry->d_inode;
if (unlikely(filp->f_op != &mqueue_file_operations))
goto out_fput;
info = MQUEUE_I(inode);
if (unlikely(filp->f_op != &mqueue_file_operations))
goto out_fput;
info = MQUEUE_I(inode);
@@
-919,7
+919,7
@@
asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
if (unlikely(!filp))
goto out;
if (unlikely(!filp))
goto out;
- inode = filp->f_dentry->d_inode;
+ inode = filp->f_
path.
dentry->d_inode;
if (unlikely(filp->f_op != &mqueue_file_operations))
goto out_fput;
info = MQUEUE_I(inode);
if (unlikely(filp->f_op != &mqueue_file_operations))
goto out_fput;
info = MQUEUE_I(inode);
@@
-1056,7
+1056,7
@@
retry:
if (!filp)
goto out;
if (!filp)
goto out;
- inode = filp->f_dentry->d_inode;
+ inode = filp->f_
path.
dentry->d_inode;
if (unlikely(filp->f_op != &mqueue_file_operations))
goto out_fput;
info = MQUEUE_I(inode);
if (unlikely(filp->f_op != &mqueue_file_operations))
goto out_fput;
info = MQUEUE_I(inode);
@@
-1126,7
+1126,7
@@
asmlinkage long sys_mq_getsetattr(mqd_t mqdes,
if (!filp)
goto out;
if (!filp)
goto out;
- inode = filp->f_dentry->d_inode;
+ inode = filp->f_
path.
dentry->d_inode;
if (unlikely(filp->f_op != &mqueue_file_operations))
goto out_fput;
info = MQUEUE_I(inode);
if (unlikely(filp->f_op != &mqueue_file_operations))
goto out_fput;
info = MQUEUE_I(inode);