X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Ffile.c;h=85c3944d3061c94bc4ef57da4b2f5f2acf1002eb;hp=ce4259dba423b81b984e9bacede5b95c1b11eeb4;hb=d821adb626e050206f1b4605f1159cf65ad22af5;hpb=fd4a2828af386e098cd97c006b930991b7bfb5b3 diff --git a/lustre/llite/file.c b/lustre/llite/file.c index ce4259d..85c3944 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -526,12 +526,12 @@ int ll_file_open(struct inode *inode, struct file *file) it = file->private_data; /* XXX: compat macro */ file->private_data = NULL; /* prevent ll_local_open assertion */ - fd = ll_file_data_get(); - if (fd == NULL) - GOTO(out_och_free, rc = -ENOMEM); + fd = ll_file_data_get(); + if (fd == NULL) + GOTO(out_openerr, rc = -ENOMEM); - fd->fd_file = file; - if (S_ISDIR(inode->i_mode)) { + fd->fd_file = file; + if (S_ISDIR(inode->i_mode)) { spin_lock(&lli->lli_sa_lock); if (lli->lli_opendir_key == NULL && lli->lli_sai == NULL && lli->lli_opendir_pid == 0) { @@ -540,7 +540,7 @@ int ll_file_open(struct inode *inode, struct file *file) opendir_set = 1; } spin_unlock(&lli->lli_sa_lock); - } + } if (inode->i_sb->s_root == file->f_dentry) { LUSTRE_FPRIVATE(file) = fd;