Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[~andy/linux] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index d8e062fe76b110a5cc66c8f0098e427e483c49f7..d6686f4786dc55b5d5f06afe913e2930f2b45b96 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -465,14 +465,12 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
        switch (sap->sa_family) {
        case AF_INET: {
                struct sockaddr_in *sin = (struct sockaddr_in *)sap;
-               seq_printf(m, ",mountaddr=" NIPQUAD_FMT,
-                               NIPQUAD(sin->sin_addr.s_addr));
+               seq_printf(m, ",mountaddr=%pI4", &sin->sin_addr.s_addr);
                break;
        }
        case AF_INET6: {
                struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
-               seq_printf(m, ",mountaddr=" NIP6_FMT,
-                               NIP6(sin6->sin6_addr));
+               seq_printf(m, ",mountaddr=%pI6", &sin6->sin6_addr);
                break;
        }
        default:
@@ -2433,7 +2431,7 @@ static void nfs4_kill_super(struct super_block *sb)
 {
        struct nfs_server *server = NFS_SB(sb);
 
-       nfs_return_all_delegations(sb);
+       nfs_super_return_all_delegations(sb);
        kill_anon_super(sb);
 
        nfs4_renewd_prepare_shutdown(server);