proc mountinfo: make splice available again

[linux-2.6-microblaze.git] / fs / nfsd / blocklayout.c

diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index 311e5ce..a07c39c 100644 (file)
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -170,7 +170,7 @@ nfsd4_block_proc_getdeviceinfo(struct super_block *sb,
                struct nfs4_client *clp,
                struct nfsd4_getdeviceinfo *gdp)
 {
-       if (sb->s_bdev != sb->s_bdev->bd_contains)
+       if (bdev_is_partition(sb->s_bdev))
                return nfserr_inval;
        return nfserrno(nfsd4_block_get_device_info_simple(sb, gdp));
 }
@@ -382,7 +382,7 @@ nfsd4_scsi_proc_getdeviceinfo(struct super_block *sb,
                struct nfs4_client *clp,
                struct nfsd4_getdeviceinfo *gdp)
 {
-       if (sb->s_bdev != sb->s_bdev->bd_contains)
+       if (bdev_is_partition(sb->s_bdev))
                return nfserr_inval;
        return nfserrno(nfsd4_block_get_device_info_scsi(sb, clp, gdp));
 }