projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux...
[linux-2.6-block.git]
/
fs
/
afs
/
flock.c
diff --git
a/fs/afs/flock.c
b/fs/afs/flock.c
index 4baf1d2b39e410ffb501c2aba457fdceadcc2cdb..d91a9c9cfbd0a9aa0770ad394af0c156057a8a85 100644
(file)
--- a/
fs/afs/flock.c
+++ b/
fs/afs/flock.c
@@
-483,7
+483,7
@@
static int afs_do_getlk(struct file *file, struct file_lock *fl)
fl->fl_type = F_UNLCK;
fl->fl_type = F_UNLCK;
-
mutex_lock(&vnode->vfs_inode.i_mutex
);
+
inode_lock(&vnode->vfs_inode
);
/* check local lock records first */
ret = 0;
/* check local lock records first */
ret = 0;
@@
-505,7
+505,7
@@
static int afs_do_getlk(struct file *file, struct file_lock *fl)
}
error:
}
error:
-
mutex_unlock(&vnode->vfs_inode.i_mutex
);
+
inode_unlock(&vnode->vfs_inode
);
_leave(" = %d [%hd]", ret, fl->fl_type);
return ret;
}
_leave(" = %d [%hd]", ret, fl->fl_type);
return ret;
}