Merge branch 'master' into for-2.6.35

[pandora-kernel.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index f30970c..1775d36 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1281,10 +1281,12 @@ static inline int lock_may_write(struct inode *inode, loff_t start,
 
 
 struct fasync_struct {
 
 
 struct fasync_struct {

-       int     magic;
-       int     fa_fd;
-       struct  fasync_struct   *fa_next; /* singly linked list */
-       struct  file            *fa_file;
+       spinlock_t              fa_lock;
+       int                     magic;
+       int                     fa_fd;
+       struct fasync_struct    *fa_next; /* singly linked list */
+       struct file             *fa_file;
+       struct rcu_head         fa_rcu;

 };
 
 #define FASYNC_MAGIC 0x4601
 };
 
 #define FASYNC_MAGIC 0x4601


@@ -1293,8 +1295,6 @@ struct fasync_struct {
 extern int fasync_helper(int, struct file *, int, struct fasync_struct **);
 /* can be called from interrupts */
 extern void kill_fasync(struct fasync_struct **, int, int);
 extern int fasync_helper(int, struct file *, int, struct fasync_struct **);
 /* can be called from interrupts */
 extern void kill_fasync(struct fasync_struct **, int, int);

-/* only for net: no internal synchronization */
-extern void __kill_fasync(struct fasync_struct *, int, int);

 
 extern int __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
 extern int f_setown(struct file *filp, unsigned long arg, int force);
 
 extern int __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
 extern int f_setown(struct file *filp, unsigned long arg, int force);


@@ -2363,6 +2363,8 @@ extern void simple_release_fs(struct vfsmount **mount, int *count);
 
 extern ssize_t simple_read_from_buffer(void __user *to, size_t count,
                        loff_t *ppos, const void *from, size_t available);
 
 extern ssize_t simple_read_from_buffer(void __user *to, size_t count,
                        loff_t *ppos, const void *from, size_t available);

+extern ssize_t simple_write_to_buffer(void *to, size_t available, loff_t *ppos,
+               const void __user *from, size_t count);

 
 extern int simple_fsync(struct file *, struct dentry *, int);
 
 
 extern int simple_fsync(struct file *, struct dentry *, int);