diff options
| author | Brian Behlendorf <[email protected]> | 2013-01-15 16:41:09 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-01-17 09:51:20 -0800 |
| commit | 7b3e34ba5a7ee8d0fda44d214f6f11eb16cdb26f (patch) | |
| tree | 0f3777fcaf3861b4c17353a13e523d63a1a30fd5 /include/sys/zpl.h | |
| parent | f1a05fa11484d67161606fd1ecf50bf2abc25ced (diff) | |
Fix 'zfs rollback' on mounted file systems
Rolling back a mounted filesystem with open file handles and
cached dentries+inodes never worked properly in ZoL. The
major issue was that Linux provides no easy mechanism for
modules to invalidate the inode cache for a file system.
Because of this it was possible that an inode from the previous
filesystem would not get properly dropped from the cache during
rolling back. Then a new inode with the same inode number would
be create and collide with the existing cached inode. Ideally
this would trigger an VERIFY() but in practice the error wasn't
handled and it would just NULL reference.
Luckily, this issue can be resolved by sprucing up the existing
Solaris zfs_rezget() functionality for the Linux VFS.
The way it works now is that when a file system is rolled back
all the cached inodes will be traversed and refetched from disk.
If a version of the cached inode exists on disk the in-core
copy will be updated accordingly. If there is no match for that
object on disk it will be unhashed from the inode cache and
marked as stale.
This will effectively make the inode unfindable for lookups
allowing the inode number to be immediately recycled. The inode
will then only be accessible from the cached dentries. Subsequent
dentry lookups which reference a stale inode will result in the
dentry being invalidated. Once invalidated the dentry will drop
its reference on the inode allowing it to be safely pruned from
the cache.
Special care is taken for negative dentries since they do not
reference any inode. These dentires will be invalidate based
on when they were added to the dentry cache. Entries added
before the last rollback will be invalidate to prevent them
from masking real files in the dataset.
Two nice side effects of this fix are:
* Removes the dependency on spl_invalidate_inodes(), it can now
be safely removed from the SPL when we choose to do so.
* zfs_znode_alloc() no longer requires a dentry to be passed.
This effectively reverts this portition of the code to its
upstream counterpart. The dentry is not instantiated more
correctly in the Linux ZPL layer.
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ned Bass <[email protected]>
Closes #795
Diffstat (limited to 'include/sys/zpl.h')
| -rw-r--r-- | include/sys/zpl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sys/zpl.h b/include/sys/zpl.h index e34b323bd..61a57ef29 100644 --- a/include/sys/zpl.h +++ b/include/sys/zpl.h @@ -28,18 +28,20 @@ #include <sys/vfs.h> #include <linux/vfs_compat.h> #include <linux/xattr_compat.h> +#include <linux/dcache_compat.h> #include <linux/exportfs.h> #include <linux/writeback.h> #include <linux/falloc.h> /* zpl_inode.c */ extern void zpl_vap_init(vattr_t *vap, struct inode *dir, - struct dentry *dentry, zpl_umode_t mode, cred_t *cr); + zpl_umode_t mode, cred_t *cr); extern const struct inode_operations zpl_inode_operations; extern const struct inode_operations zpl_dir_inode_operations; extern const struct inode_operations zpl_symlink_inode_operations; extern const struct inode_operations zpl_special_inode_operations; +extern dentry_operations_t zpl_dentry_operations; /* zpl_file.c */ extern ssize_t zpl_read_common(struct inode *ip, const char *buf, |