diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-27 18:45:17 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-27 18:45:17 -0400 |
| commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
| tree | 92586df0daf3298262a957640e5c86679c963f41 /fs/nfsd | |
| parent | ddc04fd4d5163aee9ebdb38a56c365b602e2b7b7 (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 00388d2a3c99..5c01fc148ce8 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
| @@ -176,7 +176,7 @@ static const struct file_operations exports_operations = { | |||
| 176 | extern int nfsd_pool_stats_open(struct inode *inode, struct file *file); | 176 | extern int nfsd_pool_stats_open(struct inode *inode, struct file *file); |
| 177 | extern int nfsd_pool_stats_release(struct inode *inode, struct file *file); | 177 | extern int nfsd_pool_stats_release(struct inode *inode, struct file *file); |
| 178 | 178 | ||
| 179 | static struct file_operations pool_stats_operations = { | 179 | static const struct file_operations pool_stats_operations = { |
| 180 | .open = nfsd_pool_stats_open, | 180 | .open = nfsd_pool_stats_open, |
| 181 | .read = seq_read, | 181 | .read = seq_read, |
| 182 | .llseek = seq_lseek, | 182 | .llseek = seq_lseek, |