summaryrefslogtreecommitdiff
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 ae9c46e..96988cc 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)
int error;
int do_unlock = 0;
- if (likely(file != &gfs2_internal_file_sentinal)) {
+ if (likely(file != &gfs2_internal_file_sentinel)) {
if (file) {
struct gfs2_file *gf = file->private_data;
if (test_bit(GFF_EXLOCK, &gf->f_flags))
@@ -285,7 +285,7 @@ skip_lock:
if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
error = -EIO;
- if (file != &gfs2_internal_file_sentinal) {
+ if (file != &gfs2_internal_file_sentinel) {
gfs2_glock_dq_m(1, &gh);
gfs2_holder_uninit(&gh);
}
@@ -324,7 +324,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping,
int ret;
int do_unlock = 0;
- if (likely(file != &gfs2_internal_file_sentinal)) {
+ if (likely(file != &gfs2_internal_file_sentinel)) {
if (file) {
struct gfs2_file *gf = file->private_data;
if (test_bit(GFF_EXLOCK, &gf->f_flags))
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index f5ddd49..9dcf72a 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -79,7 +79,7 @@ struct filldir_reg {
* any other part of this. Its use is purely as a flag so that we
* know (in readpage()) whether or not do to locking.
*/
-struct file gfs2_internal_file_sentinal = {
+struct file gfs2_internal_file_sentinel = {
.f_flags = O_NOATIME|O_RDONLY,
};
@@ -112,7 +112,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state,
desc.count = size;
desc.error = 0;
do_generic_mapping_read(inode->i_mapping, ra_state,
- &gfs2_internal_file_sentinal, pos, &desc,
+ &gfs2_internal_file_sentinel, pos, &desc,
gfs2_read_actor);
return desc.written ? desc.written : desc.error;
}
diff --git a/fs/gfs2/ops_file.h b/fs/gfs2/ops_file.h
index 064e52c..b1c1bf8 100644
--- a/fs/gfs2/ops_file.h
+++ b/fs/gfs2/ops_file.h
@@ -9,7 +9,7 @@
#ifndef __OPS_FILE_DOT_H__
#define __OPS_FILE_DOT_H__
-extern struct file gfs2_internal_file_sentinal;
+extern struct file gfs2_internal_file_sentinel;
extern int gfs2_internal_read(struct gfs2_inode *ip,
struct file_ra_state *ra_state,
char *buf, loff_t *pos, unsigned size);