1 diff -urNp linux-2.6.35.5/include/linux/fs.h linux-2.6.35.5/include/linux/fs.h
2 --- linux-2.6.35.5/include/linux/fs.h 2010-09-20 17:33:09.000000000 -0400
3 +++ linux-2.6.35.5/include/linux/fs.h 2010-09-20 17:33:35.000000000 -0400
4 @@ -572,41 +577,41 @@ typedef int (*read_actor_t)(read_descrip
5 unsigned long, unsigned long);
7 struct address_space_operations {
8 - int (* const writepage)(struct page *page, struct writeback_control *wbc);
9 - int (* const readpage)(struct file *, struct page *);
10 - void (* const sync_page)(struct page *);
11 + int (*writepage)(struct page *page, struct writeback_control *wbc);
12 + int (*readpage)(struct file *, struct page *);
13 + void (*sync_page)(struct page *);
15 /* Write back some dirty pages from this mapping. */
16 - int (* const writepages)(struct address_space *, struct writeback_control *);
17 + int (*writepages)(struct address_space *, struct writeback_control *);
19 /* Set a page dirty. Return true if this dirtied it */
20 - int (* const set_page_dirty)(struct page *page);
21 + int (*set_page_dirty)(struct page *page);
23 - int (* const readpages)(struct file *filp, struct address_space *mapping,
24 + int (*readpages)(struct file *filp, struct address_space *mapping,
25 struct list_head *pages, unsigned nr_pages);
27 - int (* const write_begin)(struct file *, struct address_space *mapping,
28 + int (*write_begin)(struct file *, struct address_space *mapping,
29 loff_t pos, unsigned len, unsigned flags,
30 struct page **pagep, void **fsdata);
31 - int (* const write_end)(struct file *, struct address_space *mapping,
32 + int (*write_end)(struct file *, struct address_space *mapping,
33 loff_t pos, unsigned len, unsigned copied,
34 struct page *page, void *fsdata);
36 /* Unfortunately this kludge is needed for FIBMAP. Don't use it */
37 - sector_t (* const bmap)(struct address_space *, sector_t);
38 - void (* const invalidatepage) (struct page *, unsigned long);
39 - int (* const releasepage) (struct page *, gfp_t);
40 - ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
41 + sector_t (*bmap)(struct address_space *, sector_t);
42 + void (*invalidatepage) (struct page *, unsigned long);
43 + int (*releasepage) (struct page *, gfp_t);
44 + ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
45 loff_t offset, unsigned long nr_segs);
46 - int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
47 + int (*get_xip_mem)(struct address_space *, pgoff_t, int,
48 void **, unsigned long *);
49 /* migrate the contents of a page to the specified target */
50 - int (* const migratepage) (struct address_space *,
51 + int (*migratepage) (struct address_space *,
52 struct page *, struct page *);
53 - int (* const launder_page) (struct page *);
54 - int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
55 + int (*launder_page) (struct page *);
56 + int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
58 - int (* const error_remove_page)(struct address_space *, struct page *);
59 + int (*error_remove_page)(struct address_space *, struct page *);
63 @@ -1036,19 +1041,19 @@ static inline int file_check_writeable(s
64 typedef struct files_struct *fl_owner_t;
66 struct file_lock_operations {
67 - void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
68 - void (* const fl_release_private)(struct file_lock *);
69 + void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
70 + void (*fl_release_private)(struct file_lock *);
73 struct lock_manager_operations {
74 - int (* const fl_compare_owner)(struct file_lock *, struct file_lock *);
75 - void (* const fl_notify)(struct file_lock *); /* unblock callback */
76 - int (* const fl_grant)(struct file_lock *, struct file_lock *, int);
77 - void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
78 - void (* const fl_release_private)(struct file_lock *);
79 - void (* const fl_break)(struct file_lock *);
80 - int (* const fl_mylease)(struct file_lock *, struct file_lock *);
81 - int (* const fl_change)(struct file_lock **, int);
82 + int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
83 + void (*fl_notify)(struct file_lock *); /* unblock callback */
84 + int (*fl_grant)(struct file_lock *, struct file_lock *, int);
85 + void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
86 + void (*fl_release_private)(struct file_lock *);
87 + void (*fl_break)(struct file_lock *);
88 + int (*fl_mylease)(struct file_lock *, struct file_lock *);
89 + int (*fl_change)(struct file_lock **, int);