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

Commit d2118588 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue 

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue:
  vfs: add d_prune dentry operation
  vfs: protect i_nlink
  filesystems: add set_nlink()
  filesystems: add missing nlink wrappers
  logfs: remove unnecessary nlink setting
  ocfs2: remove unnecessary nlink setting
  jfs: remove unnecessary nlink setting
  hypfs: remove unnecessary nlink setting
  vfs: ignore error on forced remount
  readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
  vfs: fix dentry leak in simple_fill_super()
parents f1f8935a f0023bc6

Documentation/filesystems/Locking

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ d_hash no no no maybe 
d_compare:	yes		no		no		maybe

d_delete:	no		yes		no		no

d_release:	no		no		yes		no

d_prune:        no              yes             no              no

d_iput:		no		no		yes		no

d_dname:	no		no		no		no

d_automount:	no		no		yes		no

arch/s390/hypfs/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -108,9 +108,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) 
		ret->i_gid = hypfs_info->gid;

		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;

		if (mode & S_IFDIR)

			ret->i_nlink = 2;

		else

			ret->i_nlink = 1;

			set_nlink(ret, 2);

	}

	return ret;

}
@@ -361,7 +359,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb, 
	} else if (mode & S_IFDIR) {

		inode->i_op = &simple_dir_inode_operations;

		inode->i_fop = &simple_dir_operations;

		parent->d_inode->i_nlink++;

		inc_nlink(parent->d_inode);

	} else

		BUG();

	inode->i_private = data;

drivers/mtd/mtdchar.c

+1 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ static void mtdchar_notify_remove(struct mtd_info *mtd) 


	if (mtd_ino) {

		/* Destroy the inode if it exists */

		mtd_ino->i_nlink = 0;

		clear_nlink(mtd_ino);

		iput(mtd_ino);

	}

}

drivers/staging/pohmelfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ const struct inode_operations pohmelfs_file_inode_operations = { 
void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info)

{

	inode->i_mode = info->mode;

	inode->i_nlink = info->nlink;

	set_nlink(inode, info->nlink);

	inode->i_uid = info->uid;

	inode->i_gid = info->gid;

	inode->i_blocks = info->blocks;

fs/9p/vfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, 
	struct v9fs_session_info *v9ses = sb->s_fs_info;

	struct v9fs_inode *v9inode = V9FS_I(inode);



	inode->i_nlink = 1;

	set_nlink(inode, 1);



	inode->i_atime.tv_sec = stat->atime;

	inode->i_mtime.tv_sec = stat->mtime;
@@ -1164,7 +1164,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, 
			/* HARDLINKCOUNT %u */

			sscanf(ext, "%13s %u", tag_name, &i_nlink);

			if (!strncmp(tag_name, "HARDLINKCOUNT", 13))

				inode->i_nlink = i_nlink;

				set_nlink(inode, i_nlink);

		}

	}

	mode = stat->mode & S_IALLUGO;