aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/ops_address.c6
-rw-r--r--fs/gfs2/ops_file.c4
-rw-r--r--fs/gfs2/ops_file.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index ae9c46e75392..96988ccf2087 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -262,7 +262,7 @@ static int gfs2_readpage(struct file *file, struct page *page)
262 int error; 262 int error;
263 int do_unlock = 0; 263 int do_unlock = 0;
264 264
265 if (likely(file != &gfs2_internal_file_sentinal)) { 265 if (likely(file != &gfs2_internal_file_sentinel)) {
266 if (file) { 266 if (file) {
267 struct gfs2_file *gf = file->private_data; 267 struct gfs2_file *gf = file->private_data;
268 if (test_bit(GFF_EXLOCK, &gf->f_flags)) 268 if (test_bit(GFF_EXLOCK, &gf->f_flags))
@@ -285,7 +285,7 @@ skip_lock:
285 if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) 285 if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
286 error = -EIO; 286 error = -EIO;
287 287
288 if (file != &gfs2_internal_file_sentinal) { 288 if (file != &gfs2_internal_file_sentinel) {
289 gfs2_glock_dq_m(1, &gh); 289 gfs2_glock_dq_m(1, &gh);
290 gfs2_holder_uninit(&gh); 290 gfs2_holder_uninit(&gh);
291 } 291 }
@@ -324,7 +324,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping,
324 int ret; 324 int ret;
325 int do_unlock = 0; 325 int do_unlock = 0;
326 326
327 if (likely(file != &gfs2_internal_file_sentinal)) { 327 if (likely(file != &gfs2_internal_file_sentinel)) {
328 if (file) { 328 if (file) {
329 struct gfs2_file *gf = file->private_data; 329 struct gfs2_file *gf = file->private_data;
330 if (test_bit(GFF_EXLOCK, &gf->f_flags)) 330 if (test_bit(GFF_EXLOCK, &gf->f_flags))
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index f5ddd496d3ec..9dcf72aa9f66 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -79,7 +79,7 @@ struct filldir_reg {
79 * any other part of this. Its use is purely as a flag so that we 79 * any other part of this. Its use is purely as a flag so that we
80 * know (in readpage()) whether or not do to locking. 80 * know (in readpage()) whether or not do to locking.
81 */ 81 */
82struct file gfs2_internal_file_sentinal = { 82struct file gfs2_internal_file_sentinel = {
83 .f_flags = O_NOATIME|O_RDONLY, 83 .f_flags = O_NOATIME|O_RDONLY,
84}; 84};
85 85
@@ -112,7 +112,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state,
112 desc.count = size; 112 desc.count = size;
113 desc.error = 0; 113 desc.error = 0;
114 do_generic_mapping_read(inode->i_mapping, ra_state, 114 do_generic_mapping_read(inode->i_mapping, ra_state,
115 &gfs2_internal_file_sentinal, pos, &desc, 115 &gfs2_internal_file_sentinel, pos, &desc,
116 gfs2_read_actor); 116 gfs2_read_actor);
117 return desc.written ? desc.written : desc.error; 117 return desc.written ? desc.written : desc.error;
118} 118}
diff --git a/fs/gfs2/ops_file.h b/fs/gfs2/ops_file.h
index 064e52c30665..b1c1bf838ec9 100644
--- a/fs/gfs2/ops_file.h
+++ b/fs/gfs2/ops_file.h
@@ -9,7 +9,7 @@
9 9
10#ifndef __OPS_FILE_DOT_H__ 10#ifndef __OPS_FILE_DOT_H__
11#define __OPS_FILE_DOT_H__ 11#define __OPS_FILE_DOT_H__
12extern struct file gfs2_internal_file_sentinal; 12extern struct file gfs2_internal_file_sentinel;
13extern int gfs2_internal_read(struct gfs2_inode *ip, 13extern int gfs2_internal_read(struct gfs2_inode *ip,
14 struct file_ra_state *ra_state, 14 struct file_ra_state *ra_state,
15 char *buf, loff_t *pos, unsigned size); 15 char *buf, loff_t *pos, unsigned size);