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
Merge branch 'condvar'
[zfs.git]
/
module
/
zfs
/
zfs_ctldir.c
diff --git
a/module/zfs/zfs_ctldir.c
b/module/zfs/zfs_ctldir.c
index
c49d717
..
41d3365
100644
(file)
--- a/
module/zfs/zfs_ctldir.c
+++ b/
module/zfs/zfs_ctldir.c
@@
-920,8
+920,8
@@
zfsctl_lookup_objset(struct super_block *sb, uint64_t objsetid, zfs_sb_t **zsbp)
* race cannot occur to an expired mount point because
* we hold the zsb->z_ctldir_lock to prevent the race.
*/
* race cannot occur to an expired mount point because
* we hold the zsb->z_ctldir_lock to prevent the race.
*/
- sbp = sget(&zpl_fs_type, zfsctl_test_super,
- zfsctl_set_super, &id);
+ sbp =
zpl_
sget(&zpl_fs_type, zfsctl_test_super,
+ zfsctl_set_super,
0,
&id);
if (IS_ERR(sbp)) {
error = -PTR_ERR(sbp);
} else {
if (IS_ERR(sbp)) {
error = -PTR_ERR(sbp);
} else {
@@
-952,7
+952,7
@@
zfsctl_shares_lookup(struct inode *dip, char *name, struct inode **ipp,
if (zsb->z_shares_dir == 0) {
ZFS_EXIT(zsb);
if (zsb->z_shares_dir == 0) {
ZFS_EXIT(zsb);
- return (
-
ENOTSUP);
+ return (ENOTSUP);
}
error = zfs_zget(zsb, zsb->z_shares_dir, &dzp);
}
error = zfs_zget(zsb, zsb->z_shares_dir, &dzp);