Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'gfs2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes 

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
  atomic_open"

* tag 'gfs2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: Fix ref count bug relating to atomic_open
  GFS2: fix potential NULL pointer dereference
parents fb0d1eb8 ea0341e0

fs/gfs2/glock.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1899,7 +1899,8 @@ static int gfs2_glock_iter_next(struct gfs2_glock_iter *gi) 
			gi->nhash = 0;

			gi->nhash = 0;

		}

		}

	/* Skip entries for other sb and dead entries */

	/* 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 ||

		 __lockref_is_dead(&gi->gl->gl_lockref));





	return 0;

	return 0;

}

}

fs/gfs2/inode.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1171,8 +1171,11 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry, 
	if (d != NULL)

	if (d != NULL)

		dentry = d;

		dentry = d;

	if (dentry->d_inode) {

	if (dentry->d_inode) {

		if (!(*opened & FILE_OPENED))

		if (!(*opened & FILE_OPENED)) {

			if (d == NULL)

				dget(dentry);

			return finish_no_open(file, dentry);

			return finish_no_open(file, dentry);

		}

		dput(d);

		dput(d);

		return 0;

		return 0;

	}

	}