diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 15:27:26 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 15:27:26 -0400 |
| commit | ee9a3607fb03e804ddf624544105f4e34260c380 (patch) | |
| tree | ce41b6e0fa10982a306f6c142a92dbf3c9961284 /include/linux/fs.h | |
| parent | b492e95be0ae672922f4734acf3f5d35c30be948 (diff) | |
| parent | d515e86e639890b33a09390d062b0831664f04a2 (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
fs/ext3/fsync.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index f30970c97acf..1775d362732d 100644 --- 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, | |||
| 1281 | 1281 | ||
| 1282 | 1282 | ||
| 1283 | struct fasync_struct { | 1283 | struct fasync_struct { |
| 1284 | int magic; | 1284 | spinlock_t fa_lock; |
| 1285 | int fa_fd; | 1285 | int magic; |
| 1286 | struct fasync_struct *fa_next; /* singly linked list */ | 1286 | int fa_fd; |
| 1287 | struct file *fa_file; | 1287 | struct fasync_struct *fa_next; /* singly linked list */ |
| 1288 | struct file *fa_file; | ||
| 1289 | struct rcu_head fa_rcu; | ||
| 1288 | }; | 1290 | }; |
| 1289 | 1291 | ||
| 1290 | #define FASYNC_MAGIC 0x4601 | 1292 | #define FASYNC_MAGIC 0x4601 |
| @@ -1293,8 +1295,6 @@ struct fasync_struct { | |||
| 1293 | extern int fasync_helper(int, struct file *, int, struct fasync_struct **); | 1295 | extern int fasync_helper(int, struct file *, int, struct fasync_struct **); |
| 1294 | /* can be called from interrupts */ | 1296 | /* can be called from interrupts */ |
| 1295 | extern void kill_fasync(struct fasync_struct **, int, int); | 1297 | extern void kill_fasync(struct fasync_struct **, int, int); |
| 1296 | /* only for net: no internal synchronization */ | ||
| 1297 | extern void __kill_fasync(struct fasync_struct *, int, int); | ||
| 1298 | 1298 | ||
| 1299 | extern int __f_setown(struct file *filp, struct pid *, enum pid_type, int force); | 1299 | extern int __f_setown(struct file *filp, struct pid *, enum pid_type, int force); |
| 1300 | extern int f_setown(struct file *filp, unsigned long arg, int force); | 1300 | 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); | |||
| 2363 | 2363 | ||
| 2364 | extern ssize_t simple_read_from_buffer(void __user *to, size_t count, | 2364 | extern ssize_t simple_read_from_buffer(void __user *to, size_t count, |
| 2365 | loff_t *ppos, const void *from, size_t available); | 2365 | loff_t *ppos, const void *from, size_t available); |
| 2366 | extern ssize_t simple_write_to_buffer(void *to, size_t available, loff_t *ppos, | ||
| 2367 | const void __user *from, size_t count); | ||
| 2366 | 2368 | ||
| 2367 | extern int simple_fsync(struct file *, struct dentry *, int); | 2369 | extern int simple_fsync(struct file *, struct dentry *, int); |
| 2368 | 2370 | ||