Merge tag 'x86_asm_for_v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-block.git] / fs / nfs / namespace.c

diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index 2f336ace755546e327bae19cbdc117f1cbb380d2..b0ef7e7ddb30671f9171b3ca22fa2ecad0964056 100644 (file)
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -147,7 +147,7 @@ struct vfsmount *nfs_d_automount(struct path *path)
        struct nfs_fs_context *ctx;
        struct fs_context *fc;
        struct vfsmount *mnt = ERR_PTR(-ENOMEM);
-       struct nfs_server *server = NFS_SERVER(d_inode(path->dentry));
+       struct nfs_server *server = NFS_SB(path->dentry->d_sb);
        struct nfs_client *client = server->nfs_client;
        int timeout = READ_ONCE(nfs_mountpoint_expiry_timeout);
        int ret;
@@ -354,7 +354,7 @@ static int param_get_nfs_timeout(char *buffer, const struct kernel_param *kp)
                        num = (num + (HZ - 1)) / HZ;
        } else
                num = -1;
-       return scnprintf(buffer, PAGE_SIZE, "%li\n", num);
+       return sysfs_emit(buffer, "%li\n", num);
 }
 
 static const struct kernel_param_ops param_ops_nfs_timeout = {