aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-10-23 11:19:54 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-10-25 21:26:11 -0400
commit85fe4025c616a7c0ed07bc2fc8c5371b07f3888c (patch)
tree7a5db7accb6192f2911f2473b4e3191227b914cc /drivers/usb/gadget
parentf991bd2e14210fb93d722cb23e54991de20e8a3d (diff)
fs: do not assign default i_ino in new_inode
Instead of always assigning an increasing inode number in new_inode move the call to assign it into those callers that actually need it. For now callers that need it is estimated conservatively, that is the call is added to all filesystems that do not assign an i_ino by themselves. For a few more filesystems we can avoid assigning any inode number given that they aren't user visible, and for others it could be done lazily when an inode number is actually needed, but that's left for later patches. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/f_fs.c1
-rw-r--r--drivers/usb/gadget/inode.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index e4f595055208..e093fd8d04d3 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -980,6 +980,7 @@ ffs_sb_make_inode(struct super_block *sb, void *data,
980 if (likely(inode)) { 980 if (likely(inode)) {
981 struct timespec current_time = CURRENT_TIME; 981 struct timespec current_time = CURRENT_TIME;
982 982
983 inode->i_ino = usbfs_get_inode();
983 inode->i_mode = perms->mode; 984 inode->i_mode = perms->mode;
984 inode->i_uid = perms->uid; 985 inode->i_uid = perms->uid;
985 inode->i_gid = perms->gid; 986 inode->i_gid = perms->gid;
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index d1d72d946b04..ba145e7fbe03 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1991,6 +1991,7 @@ gadgetfs_make_inode (struct super_block *sb,
1991 struct inode *inode = new_inode (sb); 1991 struct inode *inode = new_inode (sb);
1992 1992
1993 if (inode) { 1993 if (inode) {
1994 inode->i_ino = get_next_ino();
1994 inode->i_mode = mode; 1995 inode->i_mode = mode;
1995 inode->i_uid = default_uid; 1996 inode->i_uid = default_uid;
1996 inode->i_gid = default_gid; 1997 inode->i_gid = default_gid;