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
Align closing fi in mount-zfs.sh
[zfs.git]
/
module
/
zfs
/
zpl_super.c
diff --git
a/module/zfs/zpl_super.c
b/module/zfs/zpl_super.c
index
73e5268
..
6e8265d
100644
(file)
--- a/
module/zfs/zpl_super.c
+++ b/
module/zfs/zpl_super.c
@@
-107,12
+107,12
@@
zpl_put_super(struct super_block *sb)
static int
zpl_sync_fs(struct super_block *sb, int wait)
{
static int
zpl_sync_fs(struct super_block *sb, int wait)
{
- cred_t *cr;
+ cred_t *cr
= CRED()
;
int error;
int error;
- cr
= (cred_t *)get_current_cred(
);
+ cr
hold(cr
);
error = -zfs_sync(sb, wait, cr);
error = -zfs_sync(sb, wait, cr);
-
put_cred
(cr);
+
crfree
(cr);
ASSERT3S(error, <=, 0);
return (error);
ASSERT3S(error, <=, 0);
return (error);
@@
-130,6
+130,16
@@
zpl_statfs(struct dentry *dentry, struct kstatfs *statp)
}
static int
}
static int
+zpl_remount_fs(struct super_block *sb, int *flags, char *data)
+{
+ int error;
+ error = -zfs_remount(sb, flags, data);
+ ASSERT3S(error, <=, 0);
+
+ return (error);
+}
+
+static int
zpl_show_options(struct seq_file *seq, struct vfsmount *vfsp)
{
struct super_block *sb = vfsp->mnt_sb;
zpl_show_options(struct seq_file *seq, struct vfsmount *vfsp)
{
struct super_block *sb = vfsp->mnt_sb;
@@
-194,10
+204,8
@@
const struct super_operations zpl_super_operations = {
.put_super = zpl_put_super,
.write_super = NULL,
.sync_fs = zpl_sync_fs,
.put_super = zpl_put_super,
.write_super = NULL,
.sync_fs = zpl_sync_fs,
- .freeze_fs = NULL,
- .unfreeze_fs = NULL,
.statfs = zpl_statfs,
.statfs = zpl_statfs,
- .remount_fs =
NULL
,
+ .remount_fs =
zpl_remount_fs
,
.show_options = zpl_show_options,
.show_stats = NULL,
};
.show_options = zpl_show_options,
.show_stats = NULL,
};