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

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

Pull vfs fixes from Al Viro:
 "Assorted fixes, most in overlayfs land"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ovl: ovl_dir_fsync() cleanup
  ovl: update MAINTAINERS
  ovl: pass dentry into ovl_dir_read_merged()
  ovl: use lockless_dereference() for upperdentry
  ovl: allow filenames with comma
  ovl: fix race in private xattr checks
  ovl: fix remove/copy-up race
  ovl: rename filesystem type to "overlay"
  isofs: avoid unused function warning
  vfs: fix reference leak in d_prune_aliases()
parents 8a84e01e 3035b675

Documentation/filesystems/overlayfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ is formed. 
At mount time, the two directories given as mount options "lowerdir" and

"upperdir" are combined into a merged directory:



  mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\

  mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\

workdir=/work /merged



The "workdir" needs to be an empty directory on the same filesystem

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -6888,11 +6888,12 @@ F: drivers/scsi/osd/ 
F:	include/scsi/osd_*

F:	fs/exofs/



OVERLAYFS FILESYSTEM

OVERLAY FILESYSTEM

M:	Miklos Szeredi <miklos@szeredi.hu>

L:	linux-fsdevel@vger.kernel.org

L:	linux-unionfs@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git

S:	Supported

F:	fs/overlayfs/*

F:	fs/overlayfs/

F:	Documentation/filesystems/overlayfs.txt



P54 WIRELESS DRIVER

fs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ obj-$(CONFIG_QNX6FS_FS) += qnx6/ 
obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/

obj-$(CONFIG_ADFS_FS)		+= adfs/

obj-$(CONFIG_FUSE_FS)		+= fuse/

obj-$(CONFIG_OVERLAYFS_FS)	+= overlayfs/

obj-$(CONFIG_OVERLAY_FS)	+= overlayfs/

obj-$(CONFIG_UDF_FS)		+= udf/

obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/

obj-$(CONFIG_OMFS_FS)		+= omfs/

fs/dcache.c

+1 −0
Original line number Diff line number Diff line
@@ -778,6 +778,7 @@ restart: 
			struct dentry *parent = lock_parent(dentry);

			if (likely(!dentry->d_lockref.count)) {

				__dentry_kill(dentry);

				dput(parent);

				goto restart;

			}

			if (parent)

fs/isofs/inode.c

+21 −21
Original line number Diff line number Diff line
@@ -170,27 +170,6 @@ struct iso9660_options{ 
	s32 sbsector;

};



/*

 * Compute the hash for the isofs name corresponding to the dentry.

 */

static int

isofs_hash_common(struct qstr *qstr, int ms)

{

	const char *name;

	int len;



	len = qstr->len;

	name = qstr->name;

	if (ms) {

		while (len && name[len-1] == '.')

			len--;

	}



	qstr->hash = full_name_hash(name, len);



	return 0;

}



/*

 * Compute the hash for the isofs name corresponding to the dentry.

 */
@@ -263,6 +242,27 @@ isofs_dentry_cmpi(const struct dentry *parent, const struct dentry *dentry, 
}



#ifdef CONFIG_JOLIET

/*

 * Compute the hash for the isofs name corresponding to the dentry.

 */

static int

isofs_hash_common(struct qstr *qstr, int ms)

{

	const char *name;

	int len;



	len = qstr->len;

	name = qstr->name;

	if (ms) {

		while (len && name[len-1] == '.')

			len--;

	}



	qstr->hash = full_name_hash(name, len);



	return 0;

}



static int

isofs_hash_ms(const struct dentry *dentry, struct qstr *qstr)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE