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

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (21 commits)
  ocfs2: Check search result in ocfs2_xattr_block_get()
  ocfs2: fix printk related build warnings in xattr.c
  ocfs2: truncate outstanding block after direct io failure
  ocfs2/xattr: Proper hash collision handle in bucket division
  ocfs2: return 0 in page_mkwrite to let VFS retry.
  ocfs2: Set journal descriptor to NULL after journal shutdown
  ocfs2: Fix check of return value of ocfs2_start_trans() in xattr.c.
  ocfs2: Let inode be really deleted when ocfs2_mknod_locked() fails
  ocfs2: Fix checking of return value of new_inode()
  ocfs2: Fix check of return value of ocfs2_start_trans()
  ocfs2: Fix some typos in xattr annotations.
  ocfs2: Remove unused ocfs2_restore_xattr_block().
  ocfs2: Don't repeat ocfs2_xattr_block_find()
  ocfs2: Specify appropriate journal access for new xattr buckets.
  ocfs2: Check errors from ocfs2_xattr_update_xattr_search()
  ocfs2: Don't return -EFAULT from a corrupt xattr entry.
  ocfs2: Check xattr block signatures properly.
  ocfs2: add handler_map array bounds checking
  ocfs2: remove duplicate definition in xattr
  ocfs2: fix function declaration and definition in xattr
  ...
parents 0906dd9d 6c1e183e

fs/ocfs2/file.c

+17 −10
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ int ocfs2_update_inode_atime(struct inode *inode, 
	mlog_entry_void();



	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);

	if (handle == NULL) {

		ret = -ENOMEM;

	if (IS_ERR(handle)) {

		ret = PTR_ERR(handle);

		mlog_errno(ret);

		goto out;

	}
@@ -312,8 +312,8 @@ static int ocfs2_simple_size_update(struct inode *inode, 
	handle_t *handle = NULL;



	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);

	if (handle == NULL) {

		ret = -ENOMEM;

	if (IS_ERR(handle)) {

		ret = PTR_ERR(handle);

		mlog_errno(ret);

		goto out;

	}
@@ -1055,8 +1055,8 @@ static int __ocfs2_write_remove_suid(struct inode *inode, 
		   (unsigned long long)OCFS2_I(inode)->ip_blkno, inode->i_mode);



	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);

	if (handle == NULL) {

		ret = -ENOMEM;

	if (IS_ERR(handle)) {

		ret = PTR_ERR(handle);

		mlog_errno(ret);

		goto out;

	}
@@ -1259,8 +1259,8 @@ static int __ocfs2_remove_inode_range(struct inode *inode, 
	}



	handle = ocfs2_start_trans(osb, OCFS2_REMOVE_EXTENT_CREDITS);

	if (handle == NULL) {

		ret = -ENOMEM;

	if (IS_ERR(handle)) {

		ret = PTR_ERR(handle);

		mlog_errno(ret);

		goto out;

	}
@@ -1352,8 +1352,8 @@ static int ocfs2_zero_partial_clusters(struct inode *inode, 
		goto out;



	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);

	if (handle == NULL) {

		ret = -ENOMEM;

	if (IS_ERR(handle)) {

		ret = PTR_ERR(handle);

		mlog_errno(ret);

		goto out;

	}
@@ -1866,6 +1866,13 @@ relock: 
		written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos,

						    ppos, count, ocount);

		if (written < 0) {

			/*

			 * direct write may have instantiated a few

			 * blocks outside i_size. Trim these off again.

			 * Don't need i_size_read because we hold i_mutex.

			 */

			if (*ppos + count > inode->i_size)

				vmtruncate(inode, inode->i_size);

			ret = written;

			goto out_dio;

		}

fs/ocfs2/inode.c

+6 −0
Original line number Diff line number Diff line
@@ -1106,6 +1106,12 @@ void ocfs2_clear_inode(struct inode *inode) 
	oi->ip_last_trans = 0;

	oi->ip_dir_start_lookup = 0;

	oi->ip_blkno = 0ULL;



	/*

	 * ip_jinode is used to track txns against this inode. We ensure that

	 * the journal is flushed before journal shutdown. Thus it is safe to

	 * have inodes get cleaned up after journal shutdown.

	 */

	jbd2_journal_release_jbd_inode(OCFS2_SB(inode->i_sb)->journal->j_journal,

				       &oi->ip_jinode);

fs/ocfs2/journal.c

+1 −0
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb) 


	/* Shutdown the kernel journal system */

	jbd2_journal_destroy(journal->j_journal);

	journal->j_journal = NULL;



	OCFS2_I(inode)->ip_open_count--;

fs/ocfs2/mmap.c

+5 −1
Original line number Diff line number Diff line
@@ -113,7 +113,11 @@ static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh, 
	 * ocfs2_write_begin_nolock().

	 */

	if (!PageUptodate(page) || page->mapping != inode->i_mapping) {

		ret = -EINVAL;

		/*

		 * the page has been umapped in ocfs2_data_downconvert_worker.

		 * So return 0 here and let VFS retry.

		 */

		ret = 0;

		goto out;

	}

fs/ocfs2/namei.c

+5 −3
Original line number Diff line number Diff line
@@ -378,8 +378,8 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, 
	}



	inode = new_inode(dir->i_sb);

	if (IS_ERR(inode)) {

		status = PTR_ERR(inode);

	if (!inode) {

		status = -ENOMEM;

		mlog(ML_ERROR, "new_inode failed!\n");

		goto leave;

	}
@@ -491,9 +491,11 @@ leave: 
			brelse(*new_fe_bh);

			*new_fe_bh = NULL;

		}

		if (inode)

		if (inode) {

			clear_nlink(inode);

			iput(inode);

		}

	}



	mlog_exit(status);

	return status;

CRA Git | Maintained and supported by SUSTech CRA and CCSE