diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /fs/gfs2/recovery.c | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'fs/gfs2/recovery.c')
-rw-r--r-- | fs/gfs2/recovery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c index b249e294a95b..6fb07d67ca8a 100644 --- a/fs/gfs2/recovery.c +++ b/fs/gfs2/recovery.c | |||
@@ -450,7 +450,7 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd) | |||
450 | fs_info(sdp, "jid=%u: Trying to acquire journal lock...\n", | 450 | fs_info(sdp, "jid=%u: Trying to acquire journal lock...\n", |
451 | jd->jd_jid); | 451 | jd->jd_jid); |
452 | 452 | ||
453 | /* Aquire the journal lock so we can do recovery */ | 453 | /* Acquire the journal lock so we can do recovery */ |
454 | 454 | ||
455 | error = gfs2_glock_nq_num(sdp, jd->jd_jid, &gfs2_journal_glops, | 455 | error = gfs2_glock_nq_num(sdp, jd->jd_jid, &gfs2_journal_glops, |
456 | LM_ST_EXCLUSIVE, | 456 | LM_ST_EXCLUSIVE, |