Commit a80ba5fe authored by wang di's avatar wang di Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: clear dir stripe md in ll_iget 



If ll_iget fails during inode initialization, especially
during striped directory lookup after creation failed,
then it should clear stripe MD before make_bad_inode(),
because make_bad_inode() will reset the i_mode, which
can cause ll_clear_inode() skip freeing those stripe MD.

Signed-off-by: default avatarwang di <di.wang@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7230
Reviewed-on: http://review.whamcloud.com/16677


Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 54576e13

drivers/staging/lustre/lustre/llite/llite_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -787,6 +787,7 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt); 
void ll_put_super(struct super_block *sb);

void ll_kill_super(struct super_block *sb);

struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock);

void ll_dir_clear_lsm_md(struct inode *inode);

void ll_clear_inode(struct inode *inode);

int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import);

int ll_setattr(struct dentry *de, struct iattr *attr);

drivers/staging/lustre/lustre/llite/llite_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock) 
	return inode;

}



static void ll_dir_clear_lsm_md(struct inode *inode)

void ll_dir_clear_lsm_md(struct inode *inode)

{

	struct ll_inode_info *lli = ll_i2info(inode);

drivers/staging/lustre/lustre/llite/namei.c

+10 −0
Original line number Diff line number Diff line
@@ -117,6 +117,14 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash, 
			rc = cl_file_inode_init(inode, md);



		if (rc) {

			/*

			 * Let's clear directory lsm here, otherwise

			 * make_bad_inode() will reset the inode mode

			 * to regular, then ll_clear_inode will not

			 * be able to clear lsm_md

			 */

			if (S_ISDIR(inode->i_mode))

				ll_dir_clear_lsm_md(inode);

			make_bad_inode(inode);

			unlock_new_inode(inode);

			iput(inode);
@@ -129,6 +137,8 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash, 
		CDEBUG(D_VFSTRACE, "got inode: "DFID"(%p): rc = %d\n",

		       PFID(&md->body->mbo_fid1), inode, rc);

		if (rc) {

			if (S_ISDIR(inode->i_mode))

				ll_dir_clear_lsm_md(inode);

			iput(inode);

			inode = ERR_PTR(rc);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE