d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'zfs diff' shares error

Browse Source 
When creating a dataset with ZoL a zsb->z_shares_dir ZAP object
will not be created because shares are unimplemented.  Instead ZoL
just sets zsb->z_shares_dir to zero to indicate there are no shares.

However, if you import a pool which was created with a different
ZFS implementation then the shares ZAP object may exist.  Code was
added to handle this case but it clearly wasn't sufficiently tested
with other ZFS pools.

There was a bug in the zpl_shares_getattr() function which passed
the wrong inode to zfs_getattr_fast() for the case where are shares
ZAP object does exist.  This causes an EIO to be returned to stat64()
which in turn causes 'zfs diff' to fail.

This fix is the pass the correct inode after a sucessful zfs_zget().
Additionally, only put away the references if we were able to get one.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Graham Booker <https://github.com/gbooker>
Signed-off-by: timemaster67 <https://github.com/timemaster67>
Closes #1426
Closes #481
This commit is contained in:
Brian Behlendorf 2013-12-04 13:50:34 -08:00
parent 99e349db92
commit 90ee9ed32f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/zfs/zpl_ctldir.c
View File

@ -497,10 +497,11 @@ zpl_shares_getattr(struct vfsmount *mnt, struct dentry *dentry,
} }
error = -zfs_zget(zsb, zsb->z_shares_dir, &dzp); error = -zfs_zget(zsb, zsb->z_shares_dir, &dzp);
if (error == 0) if (error == 0) {
error = -zfs_getattr_fast(dentry->d_inode, stat); error = -zfs_getattr_fast(ZTOI(dzp), stat);
iput(ZTOI(dzp));
}
iput(ZTOI(dzp));
ZFS_EXIT(zsb); ZFS_EXIT(zsb);
ASSERT3S(error, <=, 0); ASSERT3S(error, <=, 0);