Commit 7e567b44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Change repository in MAINTAINERS.
  ocfs2: Fix a missing credit when deleting from indexed directories.
  ocfs2/trivial: Remove unused variable in ocfs2_rename.
  ocfs2: Add missing iput() during error handling in ocfs2_dentry_attach_lock()
  ocfs2: Fix some printk() warnings.
  ocfs2: Fix 2 warning during ocfs2 make.
  ocfs2: Reserve 1 more cluster in expanding_inline_dir for indexed dir.
parents 020f932b 2191aeba

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4189,7 +4189,7 @@ P: Joel Becker 
M:	joel.becker@oracle.com

L:	ocfs2-devel@oss.oracle.com (moderated for non-subscribers)

W:	http://oss.oracle.com/projects/ocfs2/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git

S:	Supported

F:	Documentation/filesystems/ocfs2.txt

F:	Documentation/filesystems/dlmfs.txt

fs/ocfs2/dcache.c

+15 −0
Original line number Diff line number Diff line
@@ -290,6 +290,21 @@ out_attach: 
	else

		mlog_errno(ret);



	/*

	 * In case of error, manually free the allocation and do the iput().

	 * We need to do this because error here means no d_instantiate(),

	 * which means iput() will not be called during dput(dentry).

	 */

	if (ret < 0 && !alias) {

		ocfs2_lock_res_free(&dl->dl_lockres);

		BUG_ON(dl->dl_count != 1);

		spin_lock(&dentry_attach_lock);

		dentry->d_fsdata = NULL;

		spin_unlock(&dentry_attach_lock);

		kfree(dl);

		iput(inode);

	}



	dput(alias);



	return ret;

fs/ocfs2/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -2697,7 +2697,7 @@ static int ocfs2_dx_dir_index_block(struct inode *dir, 
				    u32 *num_dx_entries,

				    struct buffer_head *dirent_bh)

{

	int ret, namelen, i;

	int ret = 0, namelen, i;

	char *de_buf, *limit;

	struct ocfs2_dir_entry *de;

	struct buffer_head *dx_leaf_bh;
@@ -2934,7 +2934,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
	 */

	BUG_ON(alloc > 2);



	ret = ocfs2_reserve_clusters(osb, alloc, &data_ac);

	ret = ocfs2_reserve_clusters(osb, alloc + dx_alloc, &data_ac);

	if (ret) {

		mlog_errno(ret);

		goto out;

fs/ocfs2/export.c

+5 −4
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ static struct dentry *ocfs2_get_dentry(struct super_block *sb, 


	/* If the inode allocator bit is clear, this inode must be stale */

	if (!set) {

		mlog(0, "inode %llu suballoc bit is clear\n", blkno);

		mlog(0, "inode %llu suballoc bit is clear\n",

		     (unsigned long long)blkno);

		status = -ESTALE;

		goto unlock_nfs_sync;

	}
@@ -114,7 +115,7 @@ check_err: 
	if (status < 0) {

		if (status == -ESTALE) {

			mlog(0, "stale inode ino: %llu generation: %u\n",

			     blkno, handle->ih_generation);

			     (unsigned long long)blkno, handle->ih_generation);

		}

		result = ERR_PTR(status);

		goto bail;
@@ -129,8 +130,8 @@ check_err: 
check_gen:

	if (handle->ih_generation != inode->i_generation) {

		iput(inode);

		mlog(0, "stale inode ino: %llu generation: %u\n", blkno,

		     handle->ih_generation);

		mlog(0, "stale inode ino: %llu generation: %u\n",

		     (unsigned long long)blkno, handle->ih_generation);

		result = ERR_PTR(-ESTALE);

		goto bail;

	}

fs/ocfs2/journal.h

+3 −2
Original line number Diff line number Diff line
@@ -437,8 +437,9 @@ static inline int ocfs2_unlink_credits(struct super_block *sb) 
}



/* dinode + orphan dir dinode + inode alloc dinode + orphan dir entry +

 * inode alloc group descriptor + orphan dir index leaf */

#define OCFS2_DELETE_INODE_CREDITS (3 * OCFS2_INODE_UPDATE_CREDITS + 3)

 * inode alloc group descriptor + orphan dir index root +

 * orphan dir index leaf */

#define OCFS2_DELETE_INODE_CREDITS (3 * OCFS2_INODE_UPDATE_CREDITS + 4)



/* dinode update, old dir dinode update, new dir dinode update, old

 * dir dir entry, new dir dir entry, dir entry update for renaming

CRA Git | Maintained and supported by SUSTech CRA and CCSE