diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-15 05:15:18 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-15 05:15:18 -0500 |
commit | 61a30dcb5866eb7e92796b2988ddb4c94b9f78ac (patch) | |
tree | aa27ef185437a813041aae3e9f0aa403a960db43 /fs/gfs2/ops_file.h | |
parent | 4dd651adbb4898d3200426c197b26c99d2209d8d (diff) |
[GFS2] Fix for lock recursion problem for internal files
Two internal files which are read through the gfs2_internal_read()
routine were already locked when the routine was called and this
do not need locking at the redapages level.
This patch introduces a struct file which is used as a sentinal
so that readpage will only perform locking in the case that the
struct file passed to it is _not_ equal to this sentinal.
Since the comments in the generic kernel code indicate that the
struct file will never be used for anything other than passing
straight through to readpage(), this should be ok.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_file.h')
-rw-r--r-- | fs/gfs2/ops_file.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/ops_file.h b/fs/gfs2/ops_file.h index 3c237bfc143d..192577b411f0 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__ |
12 | 12 | extern struct file gfs2_internal_file_sentinal; | |
13 | extern int gfs2_internal_read(struct gfs2_inode *ip, | 13 | extern 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); |