diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 07:29:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 07:29:15 -0700 |
| commit | 677abe49ad017679627af9d3bbd9a7ecb3d94c42 (patch) | |
| tree | 7cdb7fbc95b51b288e923a3978e17ed2207a4118 /fs/gfs2/export.c | |
| parent | e90e4d9234c953b29267cc4fc9ad804128773313 (diff) | |
| parent | 6a99be5d7b5973767b1ffa4fa68fed0738589c99 (diff) | |
| download | lwn-677abe49ad017679627af9d3bbd9a7ecb3d94c42.tar.gz lwn-677abe49ad017679627af9d3bbd9a7ecb3d94c42.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: Fix typo
GFS2: stuck in inode wait, no glocks stuck
GFS2: Eliminate useless err variable
GFS2: Fix writing to non-page aligned gfs2_quota structures
GFS2: Add some useful messages
GFS2: fix quota state reporting
GFS2: Various gfs2_logd improvements
GFS2: glock livelock
GFS2: Clean up stuffed file copying
GFS2: docs update
GFS2: Remove space from slab cache name
Diffstat (limited to 'fs/gfs2/export.c')
| -rw-r--r-- | fs/gfs2/export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/export.c b/fs/gfs2/export.c index c22c21174833..dfe237a3f8ad 100644 --- a/fs/gfs2/export.c +++ b/fs/gfs2/export.c @@ -168,7 +168,7 @@ static struct dentry *gfs2_get_dentry(struct super_block *sb, if (error) goto fail; - inode = gfs2_inode_lookup(sb, DT_UNKNOWN, inum->no_addr, 0, 0); + inode = gfs2_inode_lookup(sb, DT_UNKNOWN, inum->no_addr, 0); if (IS_ERR(inode)) { error = PTR_ERR(inode); goto fail; |