diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:49:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:49:01 +0000 |
| commit | d221c44b7afefd8f77f8595af468dfacb3b21cc2 (patch) | |
| tree | ef1c7aa4fe157c9f63be777cc6809f292da1f5d5 /fs/locks.c | |
| parent | 51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (diff) | |
Merge with Linux 2.3.8.
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index dee45cabc..301b92c9e 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -512,7 +512,9 @@ repeat: while ((fl = *before) != NULL) { if ((fl->fl_flags & FL_FLOCK) && fl->fl_file == filp) { int (*lock)(struct file *, int, struct file_lock *); - lock = filp->f_op->lock; + lock = NULL; + if (filp->f_op) + lock = filp->f_op->lock; if (lock) { file_lock = *fl; file_lock.fl_type = F_UNLCK; |