Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev:
  [PATCH] fix bogus argument of blkdev_put() in pktcdvd
  [PATCH 2/2] documnt FMODE_ constants
  [PATCH 1/2] kill FMODE_NDELAY_NOW
  [PATCH] clean up blkdev_get a little bit
  [PATCH] Fix block dev compat ioctl handling
  [PATCH] kill obsolete temporary comment in swsusp_close()
This commit is contained in:
Linus Torvalds
2008-12-04 21:45:44 -08:00
7 changed files with 68 additions and 27 deletions

View File

@@ -633,7 +633,7 @@ void swsusp_close(fmode_t mode)
return;
}
blkdev_put(resume_bdev, mode); /* move up */
blkdev_put(resume_bdev, mode);
}
static int swsusp_header_init(void)