git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanly support debug packages
[zfs.git]
/
module
/
zfs
/
zpl_super.c
diff --git
a/module/zfs/zpl_super.c
b/module/zfs/zpl_super.c
index
3abb26a
..
0e6e936
100644
(file)
--- a/
module/zfs/zpl_super.c
+++ b/
module/zfs/zpl_super.c
@@
-139,21
+139,31
@@
zpl_remount_fs(struct super_block *sb, int *flags, char *data)
return (error);
}
return (error);
}
+/*
+ * The Linux VFS automatically handles the following flags:
+ * MNT_NOSUID, MNT_NODEV, MNT_NOEXEC, MNT_NOATIME, MNT_READONLY
+ */
+#ifdef HAVE_SHOW_OPTIONS_WITH_DENTRY
static int
static int
-zpl_show_options(struct seq_file *seq, struct
vfsmount *vfsp
)
+zpl_show_options(struct seq_file *seq, struct
dentry *root
)
{
{
- struct super_block *sb = vfsp->mnt_sb;
- zfs_sb_t *zsb = sb->s_fs_info;
+ zfs_sb_t *zsb = root->d_sb->s_fs_info;
+
+ seq_printf(seq, ",%s", zsb->z_flags & ZSB_XATTR ? "xattr" : "noxattr");
- /*
- * The Linux VFS automatically handles the following flags:
- * MNT_NOSUID, MNT_NODEV, MNT_NOEXEC, MNT_NOATIME, MNT_READONLY
- */
+ return (0);
+}
+#else
+static int
+zpl_show_options(struct seq_file *seq, struct vfsmount *vfsp)
+{
+ zfs_sb_t *zsb = vfsp->mnt_sb->s_fs_info;
seq_printf(seq, ",%s", zsb->z_flags & ZSB_XATTR ? "xattr" : "noxattr");
return (0);
}
seq_printf(seq, ",%s", zsb->z_flags & ZSB_XATTR ? "xattr" : "noxattr");
return (0);
}
+#endif /* HAVE_SHOW_OPTIONS_WITH_DENTRY */
static int
zpl_fill_super(struct super_block *sb, void *data, int silent)
static int
zpl_fill_super(struct super_block *sb, void *data, int silent)