diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-10-23 11:19:54 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-25 21:26:11 -0400 |
| commit | 85fe4025c616a7c0ed07bc2fc8c5371b07f3888c (patch) | |
| tree | 7a5db7accb6192f2911f2473b4e3191227b914cc /net | |
| parent | f991bd2e14210fb93d722cb23e54991de20e8a3d (diff) | |
| download | linux-stable-85fe4025c616a7c0ed07bc2fc8c5371b07f3888c.tar.gz linux-stable-85fe4025c616a7c0ed07bc2fc8c5371b07f3888c.tar.bz2 linux-stable-85fe4025c616a7c0ed07bc2fc8c5371b07f3888c.zip | |
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 'net')
| -rw-r--r-- | net/socket.c | 1 | ||||
| -rw-r--r-- | net/sunrpc/rpc_pipe.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index d223725f99e5..5cac1c707755 100644 --- a/net/socket.c +++ b/net/socket.c @@ -480,6 +480,7 @@ static struct socket *sock_alloc(void) sock = SOCKET_I(inode); kmemcheck_annotate_bitfield(sock, type); + inode->i_ino = get_next_ino(); inode->i_mode = S_IFSOCK | S_IRWXUGO; inode->i_uid = current_fsuid(); inode->i_gid = current_fsgid(); diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 52f252432144..7df92d237cb8 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -445,6 +445,7 @@ rpc_get_inode(struct super_block *sb, umode_t mode) struct inode *inode = new_inode(sb); if (!inode) return NULL; + inode->i_ino = get_next_ino(); inode->i_mode = mode; inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; switch(mode & S_IFMT) { |