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

Merge tag 'gfs2-fixes' of git://

Pull GFS2 fixes from Steven Whitehouse:
 "A couple of small, but important bug fixes for GFS2.  The first one
  fixes a possible NULL pointer dereference, and the second one resolves
  a reference counting issue in one of the lesser used paths through

* tag 'gfs2-fixes' of git://
  GFS2: Fix ref count bug relating to atomic_open
  GFS2: fix potential NULL pointer dereference
parents fb0d1eb8 ea0341e0
......@@ -1899,7 +1899,8 @@ static int gfs2_glock_iter_next(struct gfs2_glock_iter *gi)
gi->nhash = 0;
/* Skip entries for other sb and dead entries */
} while (gi->sdp != gi->gl->gl_sbd || __lockref_is_dead(&gl->gl_lockref));
} while (gi->sdp != gi->gl->gl_sbd ||
return 0;
......@@ -1171,8 +1171,11 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,
if (d != NULL)
dentry = d;
if (dentry->d_inode) {
if (!(*opened & FILE_OPENED))
if (!(*opened & FILE_OPENED)) {
if (d == NULL)
return finish_no_open(file, dentry);
return 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment