aboutsummaryrefslogtreecommitdiff
path: root/fs/fuse
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-07-20 20:21:59 -0400
committerJ. Bruce Fields <bfields@redhat.com>2011-07-20 20:23:19 -0400
commit8fb47a4fbf858a164e973b8ea8ef5e83e61f2e50 (patch)
treed3b55fbce0e7ba5708a55b91b1ab4079ad192db6 /fs/fuse
parentc46556c6be057da79f51b1a8325ec4c27938bd49 (diff)
locks: rename lock-manager ops
Both the filesystem and the lock manager can associate operations with a lock. Confusingly, one of them (fl_release_private) actually has the same name in both operation structures. It would save some confusion to give the lock-manager ops different names. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 82a66466a24..9150865a0c5 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1495,7 +1495,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
pid_t pid = fl->fl_type != F_UNLCK ? current->tgid : 0;
int err;
- if (fl->fl_lmops && fl->fl_lmops->fl_grant) {
+ if (fl->fl_lmops && fl->fl_lmops->lm_grant) {
/* NLM needs asynchronous locks, which we don't support yet */
return -ENOLCK;
}