Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8adcc599 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs updates from Al Viro:
 "No common topic, really - a handful of assorted stuff; the least
  trivial bits are Mark's dedupe patches"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs/exofs: only use true/false for asignment of bool type variable
  fs/exofs: fix potential memory leak in mount option parsing
  Delete invalid assignment statements in do_sendfile
  iomap: remove duplicated include from iomap.c
  vfs: dedupe should return EPERM if permission is not granted
  vfs: allow dedupe of user owned read-only files
  ntfs: don't open-code ERR_CAST
  ext4: don't open-code ERR_CAST
parents 9931a07d 3642b29a

fs/exofs/super.c

+5 −2
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static int parse_options(char *options, struct exofs_mountopt *opts) 
		token = match_token(p, tokens, args);

		switch (token) {

		case Opt_name:

			kfree(opts->dev_name);

			opts->dev_name = match_strdup(&args[0]);

			if (unlikely(!opts->dev_name)) {

				EXOFS_ERR("Error allocating dev_name");
@@ -117,7 +118,7 @@ static int parse_options(char *options, struct exofs_mountopt *opts) 
					  EXOFS_MIN_PID);

				return -EINVAL;

			}

			s_pid = 1;

			s_pid = true;

			break;

		case Opt_to:

			if (match_int(&args[0], &option))
@@ -866,8 +867,10 @@ static struct dentry *exofs_mount(struct file_system_type *type, 
	int ret;



	ret = parse_options(data, &opts);

	if (ret)

	if (ret) {

		kfree(opts.dev_name);

		return ERR_PTR(ret);

	}



	if (!opts.dev_name)

		opts.dev_name = dev_name;

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -1216,7 +1216,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino) 
	bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);

	bitmap_bh = ext4_read_inode_bitmap(sb, block_group);

	if (IS_ERR(bitmap_bh))

		return (struct inode *) bitmap_bh;

		return ERR_CAST(bitmap_bh);



	/* Having the inode bit set should be a 100% indicator that this

	 * is a valid orphan (no e2fsck run on fs).  Orphans also include

fs/ext4/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -1556,7 +1556,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi 


	bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL);

	if (IS_ERR(bh))

		return (struct dentry *) bh;

		return ERR_CAST(bh);

	inode = NULL;

	if (bh) {

		__u32 ino = le32_to_cpu(de->inode);
@@ -1600,7 +1600,7 @@ struct dentry *ext4_get_parent(struct dentry *child) 


	bh = ext4_find_entry(d_inode(child), &dotdot, &de, NULL);

	if (IS_ERR(bh))

		return (struct dentry *) bh;

		return ERR_CAST(bh);

	if (!bh)

		return ERR_PTR(-ENOENT);

	ino = le32_to_cpu(de->inode);

fs/iomap.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/task_io_accounting_ops.h>

#include <linux/dax.h>

#include <linux/sched/signal.h>

#include <linux/swap.h>



#include "internal.h"

fs/ntfs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static struct dentry *ntfs_get_parent(struct dentry *child_dent) 
	/* Get the mft record of the inode belonging to the child dentry. */

	mrec = map_mft_record(ni);

	if (IS_ERR(mrec))

		return (struct dentry *)mrec;

		return ERR_CAST(mrec);

	/* Find the first file name attribute in the mft record. */

	ctx = ntfs_attr_get_search_ctx(ni, mrec);

	if (unlikely(!ctx)) {