X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_internal.h;h=f3743218362155a5e2a12fd5d028ba9ca9428d2e;hp=7351b0a0da742e9a89204d17ff24bd1f6b7210a7;hb=8f793f14bf9928352623e61122f005252605b136;hpb=490bb7a658d6d7a3608633b7416a6cf09e0d225b

diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
index 7351b0a..f374321 100644
--- a/lustre/osd-ldiskfs/osd_internal.h
+++ b/lustre/osd-ldiskfs/osd_internal.h
@@ -1031,14 +1031,22 @@ static inline struct super_block *osd_sb(const struct osd_device *dev)
 	return dev->od_mnt->mnt_sb;
 }
 
+static inline const char *osd_sb2name(const struct super_block *sb)
+{
+	/* this is LDISKFS_SB(sb), but preserves "const" */
+	const struct ldiskfs_sb_info *sbi = sb->s_fs_info;
+
+	return sbi->s_es->s_volume_name;
+}
+
 static inline const char *osd_dev2name(const struct osd_device *dev)
 {
-	return osd_sb(dev)->s_id;
+	return osd_sb2name(osd_sb(dev));
 }
 
 static inline const char *osd_ino2name(const struct inode *inode)
 {
-	return inode->i_sb->s_id;
+	return osd_sb2name(inode->i_sb);
 }
 
 /**