summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2010-10-27 05:19:36 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 05:25:45 +0200
commit12ba8d1e9262ce81a695795410bd9ee5c9407ba1 (patch)
treed2e3d4968d71f279ebfcd76dbbd0591435aebd12 /drivers
parentMerge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
downloadlinux-12ba8d1e9262ce81a695795410bd9ee5c9407ba1.tar.xz
linux-12ba8d1e9262ce81a695795410bd9ee5c9407ba1.zip
fix braino in fs: do not assign default i_ino in new_inode
usbfs_get_inode() is something completely different... Bogosity introduced by commit 85fe4025c616 ("fs: do not assign default i_ino in new_inode"). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/f_fs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index e093fd8d04d3..f276e9594f00 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -980,7 +980,7 @@ ffs_sb_make_inode(struct super_block *sb, void *data,
if (likely(inode)) {
struct timespec current_time = CURRENT_TIME;
- inode->i_ino = usbfs_get_inode();
+ inode->i_ino = get_next_ino();
inode->i_mode = perms->mode;
inode->i_uid = perms->uid;
inode->i_gid = perms->gid;