summaryrefslogtreecommitdiff
path: root/fs/afs/super.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2018-06-03 01:08:11 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2018-06-03 01:09:27 +0300
commitde52cf922a4a17d0a4cd34d697db62a01c1bd092 (patch)
tree1c12675d523eaa34e01499ae2a70dc6983a1918b /fs/afs/super.c
parent5b86d4ff5dce3271dff54119e06174dc22422903 (diff)
parent4776cab43fd3111618112737a257dc3ef368eddd (diff)
downloadlinux-de52cf922a4a17d0a4cd34d697db62a01c1bd092.tar.xz
Merge tag 'afs-fixes-20180514' into afs-proc
backmerge AFS fixes that went into mainline and deal with the conflict in fs/afs/fsclient.c Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/afs/super.c')
-rw-r--r--fs/afs/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 593820372848..8707d867334e 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -594,7 +594,7 @@ static void afs_i_init_once(void *_vnode)
memset(vnode, 0, sizeof(*vnode));
inode_init_once(&vnode->vfs_inode);
mutex_init(&vnode->io_lock);
- mutex_init(&vnode->validate_lock);
+ init_rwsem(&vnode->validate_lock);
spin_lock_init(&vnode->wb_lock);
spin_lock_init(&vnode->lock);
INIT_LIST_HEAD(&vnode->wb_keys);
@@ -692,7 +692,7 @@ static int afs_statfs(struct dentry *dentry, struct kstatfs *buf)
if (afs_begin_vnode_operation(&fc, vnode, key)) {
fc.flags |= AFS_FS_CURSOR_NO_VSLEEP;
while (afs_select_fileserver(&fc)) {
- fc.cb_break = vnode->cb_break + vnode->cb_s_break;
+ fc.cb_break = afs_calc_vnode_cb_break(vnode);
afs_fs_get_volume_status(&fc, &vs);
}