diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-04-20 16:12:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-21 01:56:29 -0400 |
commit | 8e821cad12e80cd1a8a3fbadf91f62f17f32549e (patch) | |
tree | 7a3755731152198410008921b3a2b8e7015e5f0e /include | |
parent | 7ab77e03c1f665d5dee78f1248fffd11fa0c5154 (diff) |
NFS: clean up the unstable write code
Get rid of the inlined #ifdefs.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nfs_page.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index d111be639140..16b0266b14fd 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h | |||
@@ -49,8 +49,6 @@ struct nfs_page { | |||
49 | }; | 49 | }; |
50 | 50 | ||
51 | #define NFS_WBACK_BUSY(req) (test_bit(PG_BUSY,&(req)->wb_flags)) | 51 | #define NFS_WBACK_BUSY(req) (test_bit(PG_BUSY,&(req)->wb_flags)) |
52 | #define NFS_NEED_COMMIT(req) (test_bit(PG_NEED_COMMIT,&(req)->wb_flags)) | ||
53 | #define NFS_NEED_RESCHED(req) (test_bit(PG_NEED_RESCHED,&(req)->wb_flags)) | ||
54 | 52 | ||
55 | extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx, | 53 | extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx, |
56 | struct inode *inode, | 54 | struct inode *inode, |
@@ -121,34 +119,6 @@ nfs_list_remove_request(struct nfs_page *req) | |||
121 | req->wb_list_head = NULL; | 119 | req->wb_list_head = NULL; |
122 | } | 120 | } |
123 | 121 | ||
124 | static inline int | ||
125 | nfs_defer_commit(struct nfs_page *req) | ||
126 | { | ||
127 | return !test_and_set_bit(PG_NEED_COMMIT, &req->wb_flags); | ||
128 | } | ||
129 | |||
130 | static inline void | ||
131 | nfs_clear_commit(struct nfs_page *req) | ||
132 | { | ||
133 | smp_mb__before_clear_bit(); | ||
134 | clear_bit(PG_NEED_COMMIT, &req->wb_flags); | ||
135 | smp_mb__after_clear_bit(); | ||
136 | } | ||
137 | |||
138 | static inline int | ||
139 | nfs_defer_reschedule(struct nfs_page *req) | ||
140 | { | ||
141 | return !test_and_set_bit(PG_NEED_RESCHED, &req->wb_flags); | ||
142 | } | ||
143 | |||
144 | static inline void | ||
145 | nfs_clear_reschedule(struct nfs_page *req) | ||
146 | { | ||
147 | smp_mb__before_clear_bit(); | ||
148 | clear_bit(PG_NEED_RESCHED, &req->wb_flags); | ||
149 | smp_mb__after_clear_bit(); | ||
150 | } | ||
151 | |||
152 | static inline struct nfs_page * | 122 | static inline struct nfs_page * |
153 | nfs_list_entry(struct list_head *head) | 123 | nfs_list_entry(struct list_head *head) |
154 | { | 124 | { |