diff --git a/[refs] b/[refs] index bdb60a7fca3a..c69c335eea0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d406f66ddb0d7491ddd53e4600c425d76a8a245f +refs/heads/master: dbacefc9c4f6bd365243db379473ab7041656d90 diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c index ca12a6bb82b1..4dbe52948e8f 100644 --- a/trunk/fs/buffer.c +++ b/trunk/fs/buffer.c @@ -580,7 +580,7 @@ EXPORT_SYMBOL(mark_buffer_async_write); /* * The buffer's backing address_space's private_lock must be held */ -static inline void __remove_assoc_queue(struct buffer_head *bh) +static void __remove_assoc_queue(struct buffer_head *bh) { list_del_init(&bh->b_assoc_buffers); WARN_ON(!bh->b_assoc_map);