diff options
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/extent_io.c | 3 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 6 | ||||
-rw-r--r-- | fs/btrfs/send.c | 9 | ||||
-rw-r--r-- | fs/btrfs/super.c | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 3e7c9ed6505b..45c81bb4ac82 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -929,7 +929,8 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, int bits, /** - * convert_extent - convert all bits in a given range from one bit to another + * convert_extent_bit - convert all bits in a given range from one bit to + * another * @tree: the io tree to search * @start: the start offset in bytes * @end: the end offset in bytes (inclusive) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index dac1fc21d809..48bdfd2591c2 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4248,7 +4248,7 @@ static void btrfs_dentry_release(struct dentry *dentry) } static struct dentry *btrfs_lookup(struct inode *dir, struct dentry *dentry, - struct nameidata *nd) + unsigned int flags) { struct dentry *ret; @@ -4902,7 +4902,7 @@ out_unlock: } static int btrfs_create(struct inode *dir, struct dentry *dentry, - umode_t mode, struct nameidata *nd) + umode_t mode, bool excl) { struct btrfs_trans_handle *trans; struct btrfs_root *root = BTRFS_I(dir)->root; @@ -6995,7 +6995,7 @@ void btrfs_destroy_inode(struct inode *inode) struct btrfs_ordered_extent *ordered; struct btrfs_root *root = BTRFS_I(inode)->root; - WARN_ON(!list_empty(&inode->i_dentry)); + WARN_ON(!hlist_empty(&inode->i_dentry)); WARN_ON(inode->i_data.nrpages); WARN_ON(BTRFS_I(inode)->outstanding_extents); WARN_ON(BTRFS_I(inode)->reserved_extents); diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index bf232c88a0bf..c8ca49b1bb4d 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1993,7 +1993,7 @@ static int open_cur_inode_file(struct send_ctx *sctx) { int ret = 0; struct btrfs_key key; - struct vfsmount *mnt; + struct path path; struct inode *inode; struct dentry *dentry; struct file *filp; @@ -2020,10 +2020,11 @@ static int open_cur_inode_file(struct send_ctx *sctx) goto out; } - mnt = mntget(sctx->mnt); - filp = dentry_open(dentry, mnt, O_RDONLY | O_LARGEFILE, current_cred()); + path.mnt = sctx->mnt; + path.dentry = dentry; + filp = dentry_open(&path, O_RDONLY | O_LARGEFILE, current_cred()); + dput(dentry); dentry = NULL; - mnt = NULL; if (IS_ERR(filp)) { ret = PTR_ERR(filp); goto out; diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 75ee2c7791f0..fa61ef59cd61 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1076,7 +1076,8 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, } bdev = fs_devices->latest_bdev; - s = sget(fs_type, btrfs_test_super, btrfs_set_super, fs_info); + s = sget(fs_type, btrfs_test_super, btrfs_set_super, flags | MS_NOSEC, + fs_info); if (IS_ERR(s)) { error = PTR_ERR(s); goto error_close_devices; @@ -1090,7 +1091,6 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, } else { char b[BDEVNAME_SIZE]; - s->s_flags = flags | MS_NOSEC; strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); btrfs_sb(s)->bdev_holder = fs_type; error = btrfs_fill_super(s, fs_devices, data, |