diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2017-06-29 14:27:39 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2017-06-29 14:27:39 +0200 |
commit | 61830619675b97d3da34c59c71ae51646a205e2c (patch) | |
tree | e6d39f81284bdb86ba4214c89994fb454074f583 /fs/nfs/super.c | |
parent | 8137f78a7fedeef1ffc0ac36e0ad68960eaf5010 (diff) | |
parent | c0bc126f97fb929b3ae02c1c62322645d70eb408 (diff) | |
download | linux-61830619675b97d3da34c59c71ae51646a205e2c.tar.gz linux-61830619675b97d3da34c59c71ae51646a205e2c.tar.bz2 linux-61830619675b97d3da34c59c71ae51646a205e2c.zip |
Merge tag 'v4.12-rc7' into devel
Linux 4.12-rc7
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r-- | fs/nfs/super.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 2f3822a4a7d5..eceb4eabb064 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2301,7 +2301,7 @@ EXPORT_SYMBOL_GPL(nfs_remount); /* * Initialise the common bits of the superblock */ -inline void nfs_initialise_sb(struct super_block *sb) +static void nfs_initialise_sb(struct super_block *sb) { struct nfs_server *server = NFS_SB(sb); @@ -2348,7 +2348,8 @@ EXPORT_SYMBOL_GPL(nfs_fill_super); /* * Finish setting up a cloned NFS2/3/4 superblock */ -void nfs_clone_super(struct super_block *sb, struct nfs_mount_info *mount_info) +static void nfs_clone_super(struct super_block *sb, + struct nfs_mount_info *mount_info) { const struct super_block *old_sb = mount_info->cloned->sb; struct nfs_server *server = NFS_SB(sb); |