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

Commit ce71ec36 authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds
Browse files

[PATCH] r/o bind mounts: monitor zeroing of i_nlink 



Some filesystems, instead of simply decrementing i_nlink, simply zero it
during an unlink operation.  We need to catch these in addition to the
decrement operations.

Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 17ff7856

fs/autofs4/root.c

+2 −2
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry) 
	dput(ino->dentry);



	dentry->d_inode->i_size = 0;

	dentry->d_inode->i_nlink = 0;

	clear_nlink(dentry->d_inode);



	dir->i_mtime = CURRENT_TIME;
@@ -673,7 +673,7 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry) 
	}

	dput(ino->dentry);

	dentry->d_inode->i_size = 0;

	dentry->d_inode->i_nlink = 0;

	clear_nlink(dentry->d_inode);



	if (dir->i_nlink)

		drop_nlink(dir);

fs/cifs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) 
	if (!rc) {

		drop_nlink(inode);

		i_size_write(direntry->d_inode,0);

		direntry->d_inode->i_nlink = 0;

		clear_nlink(direntry->d_inode);

	}



	cifsInode = CIFS_I(direntry->d_inode);

fs/ext3/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -2045,7 +2045,7 @@ static int ext3_rmdir (struct inode * dir, struct dentry *dentry) 
			      "empty directory has nlink!=2 (%d)",

			      inode->i_nlink);

	inode->i_version++;

	inode->i_nlink = 0;

	clear_nlink(inode);

	/* There's no need to set i_disksize: the fact that i_nlink is

	 * zero will ensure that the right thing happens during any

	 * recovery. */

fs/fuse/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry) 
		/* Set nlink to zero so the inode can be cleared, if

                   the inode does have more links this will be

                   discovered at the next lookup/getattr */

		inode->i_nlink = 0;

		clear_nlink(inode);

		fuse_invalidate_attr(inode);

		fuse_invalidate_attr(dir);

		fuse_invalidate_entry_cache(entry);
@@ -534,7 +534,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry) 
	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (!err) {

		entry->d_inode->i_nlink = 0;

		clear_nlink(entry->d_inode);

		fuse_invalidate_attr(dir);

		fuse_invalidate_entry_cache(entry);

	} else if (err == -EINTR)

fs/hfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int hfs_rmdir(struct inode *dir, struct dentry *dentry) 
	res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);

	if (res)

		return res;

	inode->i_nlink = 0;

	clear_nlink(inode);

	inode->i_ctime = CURRENT_TIME_SEC;

	hfs_delete_inode(inode);

	mark_inode_dirty(inode);