diff options
| author | Brian Behlendorf <[email protected]> | 2015-04-14 10:25:50 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-04-17 09:35:24 -0700 |
| commit | 7fad6290eb3aefc9cbb6a64e4cbe5371af53f726 (patch) | |
| tree | 581c48711eb0c635e9af2f14985302dca9142c9c /module/zfs/zpl_super.c | |
| parent | b467db454ea6507c4b9adf29c8083f860bfda2c1 (diff) | |
Mark additional functions as PF_FSTRANS
Prevent deadlocks by disabling direct reclaim during all NFS, xattr,
ctldir, and super function calls. This is related to 40d06e3.
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tim Chase <[email protected]>
Issue #3225
Diffstat (limited to 'module/zfs/zpl_super.c')
| -rw-r--r-- | module/zfs/zpl_super.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c index ef0f9d311..62fcc6cd8 100644 --- a/module/zfs/zpl_super.c +++ b/module/zfs/zpl_super.c @@ -136,20 +136,26 @@ zpl_inode_delete(struct inode *ip) static void zpl_put_super(struct super_block *sb) { + fstrans_cookie_t cookie; int error; + cookie = spl_fstrans_mark(); error = -zfs_umount(sb); + spl_fstrans_unmark(cookie); ASSERT3S(error, <=, 0); } static int zpl_sync_fs(struct super_block *sb, int wait) { + fstrans_cookie_t cookie; cred_t *cr = CRED(); int error; crhold(cr); + cookie = spl_fstrans_mark(); error = -zfs_sync(sb, wait, cr); + spl_fstrans_unmark(cookie); crfree(cr); ASSERT3S(error, <=, 0); @@ -159,9 +165,12 @@ zpl_sync_fs(struct super_block *sb, int wait) static int zpl_statfs(struct dentry *dentry, struct kstatfs *statp) { + fstrans_cookie_t cookie; int error; + cookie = spl_fstrans_mark(); error = -zfs_statvfs(dentry, statp); + spl_fstrans_unmark(cookie); ASSERT3S(error, <=, 0); return (error); @@ -170,8 +179,12 @@ zpl_statfs(struct dentry *dentry, struct kstatfs *statp) static int zpl_remount_fs(struct super_block *sb, int *flags, char *data) { + fstrans_cookie_t cookie; int error; + + cookie = spl_fstrans_mark(); error = -zfs_remount(sb, flags, data); + spl_fstrans_unmark(cookie); ASSERT3S(error, <=, 0); return (error); @@ -242,9 +255,12 @@ zpl_show_options(struct seq_file *seq, struct vfsmount *vfsp) static int zpl_fill_super(struct super_block *sb, void *data, int silent) { + fstrans_cookie_t cookie; int error; + cookie = spl_fstrans_mark(); error = -zfs_domount(sb, data, silent); + spl_fstrans_unmark(cookie); ASSERT3S(error, <=, 0); return (error); |