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

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

Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull more vfs updates from Al Viro:
 "Assorted cleanups and fixes.

  In the "trivial API change" department - ->d_compare() losing 'parent'
  argument"

* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  cachefiles: Fix race between inactivating and culling a cache object
  9p: use clone_fid()
  9p: fix braino introduced in "9p: new helper - v9fs_parent_fid()"
  vfs: make dentry_needs_remove_privs() internal
  vfs: remove file_needs_remove_privs()
  vfs: fix deadlock in file_remove_privs() on overlayfs
  get rid of 'parent' argument of ->d_compare()
  cifs, msdos, vfat, hfs+: don't bother with parent in ->d_compare()
  affs ->d_compare(): don't bother with ->d_inode
  fold _d_rehash() and __d_rehash() together
  fold dentry_rcuwalk_invalidate() into its only remaining caller
parents 0cbbc422 db20a892

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ prototypes: 
	int (*d_revalidate)(struct dentry *, unsigned int);

	int (*d_weak_revalidate)(struct dentry *, unsigned int);

	int (*d_hash)(const struct dentry *, struct qstr *);

	int (*d_compare)(const struct dentry *, const struct dentry *,

	int (*d_compare)(const struct dentry *,

			unsigned int, const char *, const struct qstr *);

	int (*d_delete)(struct dentry *);

	int (*d_init)(struct dentry *);

Documentation/filesystems/porting

+7 −0
Original line number Diff line number Diff line
@@ -585,3 +585,10 @@ in your dentry operations instead. 
	in the instances.  Rationale: !@#!@# security_d_instantiate() needs to be

	called before we attach dentry to inode and !@#!@##!@$!$#!@#$!@$!@$ smack

	->d_instantiate() uses not just ->getxattr() but ->setxattr() as well.

--

[mandatory]

	->d_compare() doesn't get parent as a separate argument anymore.  If you

	used it for finding the struct super_block involved, dentry->d_sb will

	work just as well; if it's something more complicated, use dentry->d_parent.

	Just be careful not to assume that fetching it more than once will yield

	the same value - in RCU mode it could change under you.

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ struct dentry_operations { 
	int (*d_revalidate)(struct dentry *, unsigned int);

	int (*d_weak_revalidate)(struct dentry *, unsigned int);

	int (*d_hash)(const struct dentry *, struct qstr *);

	int (*d_compare)(const struct dentry *, const struct dentry *,

	int (*d_compare)(const struct dentry *,

			unsigned int, const char *, const struct qstr *);

	int (*d_delete)(const struct dentry *);

	int (*d_init)(struct dentry *);

drivers/staging/lustre/lustre/llite/dcache.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static void ll_release(struct dentry *de) 
 * INVALID) so d_lookup() matches it, but we have no lock on it (so

 * lock_match() fails) and we spin around real_lookup().

 */

static int ll_dcompare(const struct dentry *parent, const struct dentry *dentry,

static int ll_dcompare(const struct dentry *dentry,

		       unsigned int len, const char *str,

		       const struct qstr *name)

{

fs/9p/fid.c

+1 −25
Original line number Diff line number Diff line
@@ -257,36 +257,12 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) 
	return v9fs_fid_lookup_with_uid(dentry, uid, any);

}



struct p9_fid *v9fs_fid_clone(struct dentry *dentry)

{

	struct p9_fid *fid, *ret;



	fid = v9fs_fid_lookup(dentry);

	if (IS_ERR(fid))

		return fid;



	ret = p9_client_walk(fid, 0, NULL, 1);

	return ret;

}



static struct p9_fid *v9fs_fid_clone_with_uid(struct dentry *dentry, kuid_t uid)

{

	struct p9_fid *fid, *ret;



	fid = v9fs_fid_lookup_with_uid(dentry, uid, 0);

	if (IS_ERR(fid))

		return fid;



	ret = p9_client_walk(fid, 0, NULL, 1);

	return ret;

}



struct p9_fid *v9fs_writeback_fid(struct dentry *dentry)

{

	int err;

	struct p9_fid *fid;



	fid = v9fs_fid_clone_with_uid(dentry, GLOBAL_ROOT_UID);

	fid = clone_fid(v9fs_fid_lookup_with_uid(dentry, GLOBAL_ROOT_UID, 0));

	if (IS_ERR(fid))

		goto error_out;

	/*